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

Change-Id: If80c238d80227aa88f28653639dabeeeaf46070b


Trivial merge