tree 063c75d04e85e9d1e210d5516a68d01761789c9f
parent e6699f4507e84b108f9c35725b4451f8100bea42
parent 7a79592e4e3fec25c0bdbc1e59246e5eea0f0d00
author Yueyao Zhu <yueyao@google.com> 1498073365 +0000
committer android-build-merger <android-build-merger@google.com> 1498073365 +0000

Merge "healthd: add battery health status values from JEITA spec" am: 5dd87c4ef6
am: 7a79592e4e

Change-Id: Ife13b29af4f44d3d6f5cc7b00435f4c6a57e0d2b