| commit | b3e5e8ca4d16262ca99159c4b26c59aadba069b9 | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Tue Jun 20 19:53:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 20 19:53:35 2017 +0000 |
| tree | 37fe1a2248c82d1ab5f9eb277f0b9935dd242d35 | |
| parent | caa299b18d1220aaf9776cfce600bba77cb2dd5e [diff] | |
| parent | aece2f28ec9bf81e160304d1fba261ec7d0c8e34 [diff] |
Merge "Merge "DO NOT MERGE Accommodate limitations of CTS web server" into nougat-cts-dev am: ac62ab96b8 -s ours" into nougat-mr1-cts-dev am: aece2f28ec -s ours Change-Id: I661e6dbd56acacf14cb04c9cef045c9becf528d3