| commit | 9b44480cd745f046470211dd34ade6da4408b72b | [log] [tgz] |
|---|---|---|
| author | Moriah Tobin <mtobin@google.com> | Mon Dec 11 19:33:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 11 19:33:24 2017 +0000 |
| tree | a46d8821ad0f92b38e1bb2760b00c1c39374f308 | |
| parent | dad94883487b7ace42e70bc66c936d9144262295 [diff] | |
| parent | ccab42b16708a9dac8f5982b66b89052f39c6fca [diff] |
Merge "DO NOT MERGE Allow STS to run CTS test added in nyc-mr2." into nyc-mr2-dev am: 78f7b8cca7 -s ours am: c3da747caa am: ccab42b167 Change-Id: I3d07c46b8f5ba7bcf4387e80865886be859ddb48