tree 02b6b199a0e5ef102f50fc21d75ac0fe614c03a9
parent 9a0aa553ad9f6657cbbf0a182566c481e191e6b7
parent 8dda03a08603f45b3c2c90633491ce2c1fea266b
author John Reck <jreck@google.com> 1415400932 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415400932 +0000

am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev

* commit '8dda03a08603f45b3c2c90633491ce2c1fea266b':
  Have an actual fallback if the surface is lost