| commit | bf1849f7620a3d1b9c9d23421d8f29e5db211a80 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Thu Sep 15 22:19:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 15 22:19:19 2016 +0000 |
| tree | 9094f39e6d39a04f68c0ee779249c3d5b7d24123 | |
| parent | 95bc18203b770804806f177f556b0adca008d82d [diff] | |
| parent | 270bc5bc2e97ddbc87dbc3e9b25b91806041d1a3 [diff] |
Merge "Handle charging state separately from temporary parole" into nyc-mr1-dev am: 8045bbcaf9 am: 270bc5bc2e Change-Id: Ia7dbc9a69eaabf200e6d23aee8e9ddce3dac93d4