commit | 66ed9bd52f7a1b80dada85975794e547b6ec0697 | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Tue Jun 20 19:50:29 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jun 20 19:50:30 2017 +0000 |
tree | 60d818df769851c44ee3ffa45f586d6dced4ecda | |
parent | aece2f28ec9bf81e160304d1fba261ec7d0c8e34 [diff] | |
parent | 29115d21bc7464c9217c7a97bf62c3a82c815a57 [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" into nougat-mr1-cts-dev