| commit | c6d2869330bc3add1a59d4bf35ca45c813061318 | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Wed Aug 10 16:55:02 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Aug 10 16:55:02 2016 +0000 |
| tree | a776472ca0475c0b63a664bdd329ab068fcf1336 | |
| parent | d733badc5b545af4ca136bd6685892cca8bf34cf [diff] | |
| parent | f062ffbf4499b700e3ac53d96463d1cbd53dd733 [diff] |
Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530" am: 480a3a5017 -s ours" into lollipop-mr1-cts-dev am: d105326d78 -s ours" into marshmallow-cts-dev