tree c529aa66cf31706e3c5bdff0c1efc2bb1f27237f
parent 361d16e7079e4b6e1c27df3f8ccc98b67b74a62f
parent 62729a1d195cd27b353da24be21bd0a855884431
author Ruchi Kandoi <kandoiruchi@google.com> 1440548531 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440548531 +0000

am 62729a1d: am 565e4c6a: Merge "healthd: Adds cycle_count, current_now and full_charge properties."

* commit '62729a1d195cd27b353da24be21bd0a855884431':
  healthd: Adds cycle_count, current_now and full_charge properties.