| commit | 270bc5bc2e97ddbc87dbc3e9b25b91806041d1a3 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Thu Sep 15 22:12:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 15 22:12:58 2016 +0000 |
| tree | 141c8e9ac3a4af385961b353b954673cc333b5fe | |
| parent | 42cdd6826c95f8006a424edcb6a6c714318d42b5 [diff] | |
| parent | 8045bbcaf989e5d81b14f90c5145c5e93cd15fd7 [diff] |
Merge "Handle charging state separately from temporary parole" into nyc-mr1-dev am: 8045bbcaf9 Change-Id: I15a96d9ee9c61a3be4ba6087920c36a66cd9f2c4