tree 1c7bc0bcf1b912704a3a76e98cafc7357246b4bc
parent e4dfac0e130fe95bfe445ea47ce3ed8ac590447f
parent 4883125b0df72ee404de8b244c3e6511f62947ee
author Chong Zhang <chz@google.com> 1439688883 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439688883 +0000

am 4883125b: Merge "do not dequeue from native window after we hit fatal error" into mnc-dev

* commit '4883125b0df72ee404de8b244c3e6511f62947ee':
  do not dequeue from native window after we hit fatal error