commit | 0bd92e57f0b485841bc0224e084f306278251e9f | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Thu Sep 01 02:50:16 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Sep 01 02:50:16 2016 +0000 |
tree | 7e2624f132759286fc9143463ca954f3c279e7d9 | |
parent | a16d2940e6c9d412f7f79595eb71d8cce712955a [diff] | |
parent | b9ea0bc68fffe051ed011ac37eadf0866f696a05 [diff] |
Merge "Merge "Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386 -s ours" into lollipop-mr1-cts-dev am: 8f82f57c89 -s ours" into marshmallow-cts-dev am: 18b146e360 -s ours" into nougat-cts-dev