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

Change-Id: If792fa48f885bcff8f12ed4bb7d86800ab62c575


Trivial merge