tree 067a4d0d740a8d10298b79522f1b7697b3ea2850
parent 726728d148ce6710a8e207ebbb08274dd3da2db8
parent 24a082cd49d4bd7f54970389b574ea5c64cf0896
author John Reck <jreck@google.com> 1472515335 +0000
committer android-build-merger <android-build-merger@google.com> 1472515335 +0000

Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867 am: 25c6b37613
am: 24a082cd49

Change-Id: If6a1ad186ce66d68fb79a2a5c0dc217c7161cac8