commit | 5cdc38f43269682b5e0bc67a05cbcf8d70795e50 | [log] [tgz] |
---|---|---|
author | Andres Celis <celisa@google.com> | Mon Dec 11 19:44:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Dec 11 19:44:18 2017 +0000 |
tree | a46d8821ad0f92b38e1bb2760b00c1c39374f308 | |
parent | 9b44480cd745f046470211dd34ade6da4408b72b [diff] | |
parent | 8615392d9398de3949c42a3afd1e5dac4e8b0648 [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 Change-Id: I3fbc49274aeecb2757f59c35542cc46a44755e28