tree ae8f852ba634216a08bfec2c0e0897dd29fba69d
parent 44463f8fadf9bcad3d7e42c66f22e89e5fe42ceb
parent af2d5fb699e18378190139411c87046fa07be092
author Joe Onorato <joeo@google.com> 1457571732 +0000
committer android-build-merger <android-build-merger@google.com> 1457571732 +0000

Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev am: 04a72a2a51
am: af2d5fb699

* commit 'af2d5fb699e18378190139411c87046fa07be092':
  Add an API for apps to get their System Health / Battery Stats data.