| commit | 0e2c246a7f819ab60721e831039705876f41edcb | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Mon Dec 11 20:15:12 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 11 20:15:12 2017 +0000 |
| tree | 9d666482b17ffe8d417d7f3b34a9670337808a81 | |
| parent | 41a5fcdd86155d6a076cde6cda16c4d2381cc7da [diff] | |
| parent | 27ae1e181cf0ad854b204113e1beffe3bbec0391 [diff] |
Merge "Merge "DO NOT MERGE Allow STS to run CTS tests added in nyc-mr1." into nyc-mr1-dev am: a63283f825 am: 6b4bd8a0a8 am: 70b0c41865 -s ours am: 702d57e421 am: 8b8392ef39 am: 18023bbcde" into oc-mr1-dev-plus-aosp am: 27ae1e181c -s ours Change-Id: Id0807e8e8dd5f0373c586c624476310125f17695