am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev

* commit 'deca2a041d13846158b0db92781b352ab473d9bc':
  (DO NOT MERGE) Battery monitoring fixes:
This commit is contained in:
Dianne Hackborn
2014-05-23 00:11:11 +00:00
committed by Android Git Automerger

Diff Content Not Available