Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745 am: 5dee7d5...
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 23:41:40 +0000 (23:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:41:40 +0000 (23:41 +0000)
am: baad168d2d

Change-Id: I3e273042aca17f2252d58b62657fbca0c40fc21d


Trivial merge