tree b12bf3da1c3457982ccff6c6d4aeb24d90ffb639
parent afa0e3698355f341009a8042d62c82016f86a1c8
parent fecbc5da64a992f91f74ef6c67a7e247b0da7777
author Jon Larimer <jlarimer@google.com> 1439910799 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439910799 +0000

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

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