| commit | 1adca0d52b8fd259de84123c61dfe2c0109541b4 | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Mon Jul 18 18:27:31 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jul 18 18:27:31 2016 +0000 |
| tree | 236ec53008a77188611d5e41db049af7545a07cc | |
| parent | e5cd84e54e6ea6552acb513f4b7fb86b7034afc3 [diff] | |
| parent | 8c69a161eceefc0468bef91ed8e56cb538189e77 [diff] |
Merge "Merge \"Merge \\"DO NOT MERGE: This test verifies recursive decoding of malformed ICO file which should not lead to skia buffer overflow\\" into kitkat-cts-dev am: 02c2dcc225 -s ours\" into lollipop-cts-dev am: 48183e542b -s ours" into lollipop-mr1-cts-dev