| commit | 1887dbf5e954a9e93f0925f08632d91bfcbe1e6c | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Fri Mar 04 00:28:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 04 00:28:30 2016 +0000 |
| tree | b89d74e58797d7e8a3c301d6b320d4b10491ac39 | |
| parent | 7f8112654f905441ac77dadfadec178ac4d3eebe [diff] | |
| parent | 529a32d1af982d5ce1d6bb49d2dfd4dd06ca7f81 [diff] |
Merge "Any charging device will stay awake during CTS" into marshmallow-cts-dev am: 07cc3c6919 -s ours am: 663284cb96 am: ea18fbf8d7 am: 6ae29142da am: 529a32d1af * commit '529a32d1af982d5ce1d6bb49d2dfd4dd06ca7f81': Any charging device will stay awake during CTS