| commit | 13c9a7317f48945a427f5b9ca98adde94df0226b | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Fri Mar 17 03:15:12 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 17 03:15:12 2017 +0000 |
| tree | 4e6e466b05883591fd8c34435f7eff23157c754c | |
| parent | 67e8f27357923ae1341811a9547423a1a5e64125 [diff] | |
| parent | 084e90e502b20ab2cea0a422f693fc5780ca2a99 [diff] |
Merge "Change some pending OOME asserts to be pending exception" am: de9b8d63ef am: 771f354d6c am: 084e90e502 Change-Id: I4d0230fc436c2a9392c1253b4e62197137b8d886