tree ad4b142ee287c7309b7591973dab84441608c216
parent 4897bb57e413eba8c7a56390940e8d3a746c81d5
parent 085c91bedd2da8a944703f14a6dd1fcd0c74cd73
author Nick Vaccaro <nvaccaro@google.com> 1477369505 +0000
committer android-build-merger <android-build-merger@google.com> 1477369505 +0000

Merge "Enable CHARGER_ENABLE_SUSPEND to allow suspend" into cw-f-dev
am: 085c91bedd

Change-Id: Ia22c806d137907548aa23b2ce5f7553af8ffa409