tree 2633c97263bcceff4861e9e9f01f3e866f665d64
parent 49cc9cb85376bad11611966fcdbe58dae1ab7a56
parent eaae7d976a5629e064af06f0e2c10f97f1a8c462
author Jeff Brown <jeffbrown@google.com> 1355264270 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355264270 -0800

am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev

* commit 'eaae7d976a5629e064af06f0e2c10f97f1a8c462':
  Play a tone when wireless charging begins.