Merge "Handle charging state separately from temporary parole" into nyc-mr1-dev

am: 8045bbcaf9

Change-Id: I15a96d9ee9c61a3be4ba6087920c36a66cd9f2c4
This commit is contained in:
Amith Yamasani
2016-09-15 22:12:58 +00:00
committed by android-build-merger

Diff Content Not Available