| commit | 185dccdee30f27eea58b4f2b309e196471ac09c7 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Tue Feb 14 22:37:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 14 22:37:48 2017 +0000 |
| tree | 04a7496192f3c92a7326d378b37ba3b7a1b02ccf | |
| parent | 1de2e67c49c4e7e35d0be4217e3a9924da2ce031 [diff] | |
| parent | 9419fac1c61b4bd078358cb2cc6d80a7892ce6c9 [diff] |
Merge "Merge "Merge "Merge "DO NOT MERGE Add CTS test for CVE-2016-2429" into kitkat-cts-dev am: 532f593a9e -s ours" into lollipop-cts-dev am: c2d4f15907 -s ours" into lollipop-mr1-cts-dev am: 0c39fd6bab -s ours" into marshmallow-cts-dev am: 9419fac1c6 -s ours Change-Id: I24d09704d493617dec057cb3e5a8fb53723e3f4f