tree 489211d95a97da04662d094e6df5872d5dd0ecb4
parent cad46fbde4961d5374c27f9d85cd8f2b6822ffa7
parent 5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423
author Jon Larimer <jlarimer@google.com> 1439910533 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439910533 +0000

am 5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev

* commit '5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423':
  do not dequeue from native window after we hit fatal error -- DO NOT MERGE