| commit | 7ba8b9f84531091c50ef5e1903b3428330e7b9e1 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Tue Aug 18 18:31:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 18:31:21 2015 +0000 |
| tree | a9f45be2b1a63cd1cc50f762dd0af9d1e625bd53 | |
| parent | a3a29952f485cd2ebf521273a7b36aac586451cf [diff] | |
| parent | fc26577c6023ac6861c1875e6ae02f23ce53afc0 [diff] |
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 'fc26577c6023ac6861c1875e6ae02f23ce53afc0': do not dequeue from native window after we hit fatal error -- DO NOT MERGE