tree afab11ea5d5b027876aaae042b7c62ff2d00a006
parent 9b34686d2ffa2bc65f383751220b2920b9083961
parent b86d026a7f4108caefa080cf9e0c0b4b5e275a84
author Todd Poynor <toddpoynor@google.com> 1359592241 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359592241 -0800

am b86d026a: Merge "BatteryService: Allow power supplies to switch type between AC and USB"

# Via Android (Google) Code Review (1) and Todd Poynor (1)
* commit 'b86d026a7f4108caefa080cf9e0c0b4b5e275a84':
  BatteryService: Allow power supplies to switch type between AC and USB