commit | 27ae1e181cf0ad854b204113e1beffe3bbec0391 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Mon Dec 11 20:01:42 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 11 20:01:42 2017 +0000 |
tree | 74d00c2d6b67b5018793bd8970b654f72dae4a3b | |
parent | b247fdad64d6371b5ed63d062ff417ce8b774334 [diff] | |
parent | ebe3162c762e9c6ca46df65914ecff01fe087684 [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