tree e133f64b0a3a250b0a8626119af7d3ddf2349842
parent d3bfedbb1fc6296b561e60eac19581a6f1705f9e
parent 2acadb3f26b3f9b7f2ae7c1bca219ada94066462
author Ruchi Kandoi <kandoiruchi@google.com> 1440546817 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440546817 +0000

am 2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."

* commit '2acadb3f26b3f9b7f2ae7c1bca219ada94066462':
  BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties.