diff options
| author | Daniel Xie <dxie@google.com> | 2016-09-01 04:49:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-01 04:49:17 +0000 |
| commit | e4b54808cd52e726dedf4f4827b31f7a769a3449 (patch) | |
| tree | dcdb6b28599c069699f369916c65ff01f5affebb | |
| parent | 6bc7bacefcb0ca58b7a29a86d5a3cc3fe6bda354 (diff) | |
| parent | 2200d39fe340016e1749bb752de6c59739a02250 (diff) | |
| download | cts-e4b54808cd52e726dedf4f4827b31f7a769a3449.tar.gz | |
Merge "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 am: c6d2869330 -s ours" into nougat-cts-dev am: a0b4d46a13 -s ours
am: 2200d39fe3
Change-Id: I063595d3fa098733cbc8dac8a1a98e9fe6eda759
0 files changed, 0 insertions, 0 deletions