| commit | fae389293b52f3b3a804089fc36fffc4d245bab6 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Jun 16 21:28:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 21:28:26 2017 +0000 |
| tree | 644cb33ac44e5c7a692febbc77e766730980ef20 | |
| parent | 82ae33fed76d47f4509449d1664376e693b66b81 [diff] | |
| parent | 7d37d0950e0fc3730218ea192157318ecbe2949c [diff] |
Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into oc-dev am: 5bf7ed94cf am: 7d37d0950e Change-Id: I923e026aec4897244fa9ecbddff429c2ce3aff44