commit | 8615392d9398de3949c42a3afd1e5dac4e8b0648 | [log] [tgz] |
---|---|---|
author | Andres Celis <celisa@google.com> | Mon Dec 11 19:36:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Dec 11 19:36:06 2017 +0000 |
tree | 3dad81da9fe339b67800e5ec652daa4a2769f39c | |
parent | ccab42b16708a9dac8f5982b66b89052f39c6fca [diff] | |
parent | 6282f511f28baa3d294d4047e67c21179aeed3cd [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 Change-Id: I7d7058f24a32bbcaf06d6157f5751f223598fdc8