| commit | 3444118a0139eaaeb5e253a536803f835ae30099 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 20 01:40:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:40:08 2015 +0000 |
| tree | d1d7951b388445d64b5724873b22959255bf0efa | |
| parent | a5ca50ac808061983fd7af39eed9b006237d925a [diff] | |
| parent | beb8257688fabf1c77ab6d1b04da67d5ec1975b2 [diff] |
am beb82576: 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 'beb8257688fabf1c77ab6d1b04da67d5ec1975b2': do not dequeue from native window after we hit fatal error -- DO NOT MERGE