| commit | d223d9bb6dc5c3afc1a1c7c36c9ecef34a66e53b | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Tue Aug 18 18:35:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 18:35:52 2015 +0000 |
| tree | a9f45be2b1a63cd1cc50f762dd0af9d1e625bd53 | |
| parent | a598bac211012fa1b4bd603f47755781ffb2e38c [diff] | |
| parent | 7ba8b9f84531091c50ef5e1903b3428330e7b9e1 [diff] |
am 7ba8b9f8: am fc26577c: am 698ff79c: am 27362395: (-s ours) am 2ed42aea: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into klp-dev * commit '7ba8b9f84531091c50ef5e1903b3428330e7b9e1': do not dequeue from native window after we hit fatal error -- DO NOT MERGE