| commit | beb8257688fabf1c77ab6d1b04da67d5ec1975b2 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 20 01:30:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:30:19 2015 +0000 |
| tree | 1aed0b1e0d3036eb117d1db7a6c359459c2a59d5 | |
| parent | 75d3927a9456fecc9cc88026d62fd1d025cf5dbd [diff] | |
| parent | 9eea72aba176ed98dd423986380b5fb7ef4b70d6 [diff] |
am 9eea72ab: (-s ours) 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 '9eea72aba176ed98dd423986380b5fb7ef4b70d6': do not dequeue from native window after we hit fatal error -- DO NOT MERGE