tree c80a4dcdd963c7e5c6d299ee2b8a495b639d7ffa
parent 3c9f70dc86842f78c00d19c9c266b324478bb001
parent 5fde3ff375e6cec3c11ddef7a4650d5f5f4942d1
author Todd Poynor <toddpoynor@google.com> 1402096576 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402096576 +0000

Merge "BatteryManager: battery property query API update" into lmp-preview-dev