tree 7a1de1fc46fad8849e465038311cf02bb4e6e1e9
parent ddf7e2dfc26ea5341c62cb5391a1cfb12cd8c129
parent e986817a2dc8a412c12e456319965a67ac60f236
author Chris Craik <ccraik@google.com> 1417036080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417036080 +0000

am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev

* commit 'e986817a2dc8a412c12e456319965a67ac60f236':
  Revert "Force-use the pbuffer surface for destroy"