| commit | b923d2f5fd98a75ce0415ac18c4b62a106bc7c7c | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Tue Jun 20 19:50:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 20 19:50:05 2017 +0000 |
| tree | c20ec7fff10d42b5fbe38aa0da24c93133a1dbf5 | |
| parent | 7c8a4abf6a2e44695c9afe10dde99ff70f524976 [diff] | |
| parent | 64bb150e238134be0b51311d0de6969a91cae419 [diff] |
Merge "DO NOT MERGE Accommodate limitations of CTS web server" into marshmallow-cts-dev am: 64bb150e23 -s ours Change-Id: I92ba29d07719fcdd95699a17734734ffc9e42772