Merge "Fix delete_active.transform_feedback case."
authorJarkko Pöyry <jpoyry@google.com>
Tue, 13 Jan 2015 23:00:00 +0000 (23:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Jan 2015 23:00:00 +0000 (23:00 +0000)

Trivial merge