| commit | 017ea37fd67ce2ab5826537504d9d78a1a83a33f | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 20 02:04:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 02:04:56 2015 +0000 |
| tree | bcdddf48ac422375ad01c533be22d99a356fb1e8 | |
| parent | 85faccf5e695c647d5ea667b0e632c06309884c9 [diff] | |
| parent | 3444118a0139eaaeb5e253a536803f835ae30099 [diff] |
am 3444118a: 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 '3444118a0139eaaeb5e253a536803f835ae30099': do not dequeue from native window after we hit fatal error -- DO NOT MERGE