| commit | a7082af287f44eaa48f0d9f41629b46274f53db4 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 20 02:04:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 02:04:38 2015 +0000 |
| tree | 3aa3dcf502fab5224eb48c6e6815322a97e43c05 | |
| parent | 85e6ebba06bf33f75846a0b5f3787766a214197e [diff] | |
| parent | f4491ffbc0ca0426c773338ec6f66eb65fb000a3 [diff] |
am f4491ffb: am 4976b82c: am 02a65c4f: (-s ours) am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev * commit 'f4491ffbc0ca0426c773338ec6f66eb65fb000a3': do not dequeue from native window after we hit fatal error -- DO NOT MERGE