| commit | 8045bbcaf989e5d81b14f90c5145c5e93cd15fd7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 15 22:01:39 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 15 22:01:43 2016 +0000 |
| tree | eeda4cb2d3e7a6608caa9bfb100d3b16da11a814 | |
| parent | 4a0b061ff688f7e0bc275db05854b15c944679da [diff] | |
| parent | 693d869b32b375a6b3812aa56145e334b3a8c219 [diff] |
Merge "Handle charging state separately from temporary parole" into nyc-mr1-dev