| commit | f4491ffbc0ca0426c773338ec6f66eb65fb000a3 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 20 01:39:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:39:55 2015 +0000 |
| tree | ceb525f73c6a717e50a1162d566ec5e5d6bf04f2 | |
| parent | d4106fb7f8ec029d4456e957a758a365d4afca18 [diff] | |
| parent | 4976b82c6fe1c5f37746fbfd904ac7c6216bba18 [diff] |
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 '4976b82c6fe1c5f37746fbfd904ac7c6216bba18': do not dequeue from native window after we hit fatal error -- DO NOT MERGE