| commit | e396e1cfaf67244b3b256e81ca452217bd3662ca | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 17 21:37:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 17 21:37:28 2017 +0000 |
| tree | fd5ee42f0b2e3e361d2100e4cf6f97e735252876 | |
| parent | 9c0665636578801d3883bd5da9c394495f74bd1d [diff] | |
| parent | 17682ea24adf7619a5dd08c8381259d3376ecc82 [diff] |
Merge "Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318 am: 04a45728f2 -s ours am: 41dab9b56b am: 56cf3b01fc am: b9dd2f3074 am: 3ebb5e39b5 am: 96e0201e7e" into nyc-mr2-dev-plus-aosp am: 17682ea24a Change-Id: I131e8a0d2f8d8f791b6b49cc5b2f0cae67cea091