| commit | ea18fbf8d751a942d0c14366070088a5381a5274 | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Fri Mar 04 00:21:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 04 00:21:29 2016 +0000 |
| tree | 57f1e7746ad7a9dfe9cb148b51e7a22987869aba | |
| parent | 6402dfc3e4caf2945f5f4e414ff2d59220f6f40a [diff] | |
| parent | 663284cb96f1f92a771a87d56b56de2b2b26e342 [diff] |
Merge "Any charging device will stay awake during CTS" into marshmallow-cts-dev am: 07cc3c6919 -s ours am: 663284cb96 * commit '663284cb96f1f92a771a87d56b56de2b2b26e342': Any charging device will stay awake during CTS