OSDN Git Service

Merge "Handle charging state separately from temporary parole" into nyc-mr1-dev
authorAmith Yamasani <yamasani@google.com>
Thu, 15 Sep 2016 22:12:58 +0000 (22:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 22:12:58 +0000 (22:12 +0000)
commit270bc5bc2e97ddbc87dbc3e9b25b91806041d1a3
tree141c8e9ac3a4af385961b353b954673cc333b5fe
parent42cdd6826c95f8006a424edcb6a6c714318d42b5
parent8045bbcaf989e5d81b14f90c5145c5e93cd15fd7
Merge "Handle charging state separately from temporary parole" into nyc-mr1-dev
am: 8045bbcaf9

Change-Id: I15a96d9ee9c61a3be4ba6087920c36a66cd9f2c4