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