tree f07b202ea380fb956bc11373d8993a1015b55f60
parent 647800ac46c6d1fe01551ad73d602f263242602f
parent 2057e777b31b6904fd29eac562ee15526000902f
author Ruchi Kandoi <kandoiruchi@google.com> 1440652391 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652391 +0000

am 2057e777: (-s ours) am cf1fedef: am 2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."

* commit '2057e777b31b6904fd29eac562ee15526000902f':