Merge "Tex array negative test fixes for FBTextureLayer" am: 13e9c5295c am: 78a609ac42
authorKalle Raita <kraita@google.com>
Wed, 10 Aug 2016 22:34:54 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 22:34:54 +0000 (22:34 +0000)
am: e3ceb38d90

Change-Id: I1c076a7b7c6ca59c9a8a97c9044c6c6dc9a74558


Trivial merge