commit | 8ef3902a04b59bb22dbde8796c499243633b1192 | [log] [tgz] |
---|---|---|
author | Andres Celis <celisa@google.com> | Mon Dec 11 19:51:57 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Dec 11 19:51:57 2017 +0000 |
tree | 6741e9894d485cc9be4ad7c9eec2333ca7854af1 | |
parent | ce1207adf651b4844640c7111c912a28db7d4b68 [diff] | |
parent | 5cdc38f43269682b5e0bc67a05cbcf8d70795e50 [diff] |
Merge "DO NOT MERGE: Include CTS security tests in the STS plan." into nyc-dev am: eadaacfee5 am: 083cc78d49 am: a4213b831d am: 72d8719255 am: f80dac128f -s ours am: 6282f511f2 am: 8615392d93 am: 5cdc38f432 Change-Id: I113a99e411958119f0cea9162c3685953ebe3625