| commit | 80d6186b006af4d33faecea82cbcff74411efab9 | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Tue Jun 20 20:46:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 20 20:46:31 2017 +0000 |
| tree | 886a4eaa6b10c18ff67013d842e3448a7a75e245 | |
| parent | ed0a10debe230a340d4df0ef1361c7e616e5563e [diff] | |
| parent | bd72d2ea0cea3bf76263a49cccee16430d450bd7 [diff] |
Merge "Merge "Merge "DO NOT MERGE Accommodate limitations of CTS web server" into marshmallow-cts-dev am: 64bb150e23 -s ours" into nougat-cts-dev am: 267f561b37 -s ours am: 845b533377 am: ad6487247f" into nyc-mr1-dev am: 5e89a110df am: 91bfaa082d am: 20befc02a1 -s ours am: bd72d2ea0c Change-Id: If74bb23424057bee1c87b91d33ef58ff3f183526