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