| commit | 1c5b4e3633204344f4f0e206895d503ea1579000 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jun 16 16:45:56 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 16 16:45:57 2017 +0000 |
| tree | 644cb33ac44e5c7a692febbc77e766730980ef20 | |
| parent | ab3038b5e1ac36ef78d6394baa9fe4b07bca8536 [diff] | |
| parent | f72e1ffcd470fc3160a9ca02425fb5fc9abaa8b2 [diff] |
Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: a7857dd90c am: c0e1e9fb47 am: 99ee7256eb am: 6df4eff07e -s ours am: 37a097de93 -s ours am: a7b6a6186f -s ours" into oc-dr1-dev-plus-aosp