tree fa03933437752b482480654f54d6bae881ef31f7
parent 5fbbcdcd32d471f3a1cbb713aaf76cadd79a83ba
parent eaa6d6b2c940ca4f76698cbbc5031657066065dc
author Chris Craik <ccraik@google.com> 1469492988 +0000
committer android-build-merger <android-build-merger@google.com> 1469492988 +0000

Merge \"Avoid destroying TextureView surfaces for onStop\" into nyc-mr1-dev
am: eaa6d6b2c9

Change-Id: Ic8207def7703c1209dbb3b33301803b32cc44bb7