| commit | 9eea72aba176ed98dd423986380b5fb7ef4b70d6 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 20 01:16:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:16:26 2015 +0000 |
| tree | 9aa86e47a37a2f424872b57eb5ee3bdc55a822d7 | |
| parent | 23565920c34c8163520342c4906b52a0e20aeb67 [diff] | |
| parent | d223d9bb6dc5c3afc1a1c7c36c9ecef34a66e53b [diff] |
am d223d9bb: 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 'd223d9bb6dc5c3afc1a1c7c36c9ecef34a66e53b': do not dequeue from native window after we hit fatal error -- DO NOT MERGE