tree 0c9e2785fc1cacb9e1c99dbe360063eee7d5d09c
parent fd61cfbd08752b30ebdd2fb931e4d052371e68ee
parent e57c721c1252c8398da55fe47373fa6f34d0dd74
author Chris Craik <ccraik@google.com> 1472619576 +0000
committer android-build-merger <android-build-merger@google.com> 1472619576 +0000

Cherry pick TextureView fixes am: 2e8a8a2432 am: 05cb60846c am: 2e5e9feaef am: 726728d148
am: e57c721c12

Change-Id: I320f641971f152773016aadbdbb01482593cbf87