commit | 084e90e502b20ab2cea0a422f693fc5780ca2a99 | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Fri Mar 17 03:11:31 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Mar 17 03:11:31 2017 +0000 |
tree | 4e6e466b05883591fd8c34435f7eff23157c754c | |
parent | 88f24f38ddad678bd62db5710dea9111334faeef [diff] | |
parent | 771f354d6c66c2b06b184e92f6ef1f1c2451406b [diff] |
Merge "Change some pending OOME asserts to be pending exception" am: de9b8d63ef am: 771f354d6c Change-Id: I5d0a4a359dad57580b43b20d148ec3e47e2bbf76