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