| commit | 3eb5c6f21dd10988fc14e6592121c9b591bb4bbc | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 01 15:40:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 01 15:40:03 2016 +0000 |
| tree | de2d2eae3b6167ce5b2a0c32610a4e5716f6e5c5 | |
| parent | e37f2d2f96c65bfed68618ddc1cec9c321927426 [diff] | |
| parent | 43d521ee71fb3199db65982442673ef57db79f24 [diff] |
Merge "DO NOT MERGE [CtsVerifier] Removing battery usage settings test in BYOD flow" into marshmallow-cts-dev am: d28986b0ec -s ours am: 1b544ff95f am: b49facfba7 am: 43d521ee71 * commit '43d521ee71fb3199db65982442673ef57db79f24': DO NOT MERGE [CtsVerifier] Removing battery usage settings test in BYOD flow Change-Id: I70993007dff7f82a60f85414c82ab2945b21a32b