tree fa07d3db774f101e8f55210c47bf7d1b8232e63b
parent 33da458dd832996d8b0ae945d6ab2896faff4afa
parent 37a37f445cbcd64376af153dd79ea2a123d9405d
author Brian Muramatsu <btmura@google.com> 1345507033 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1345507034 -0700

Merge "add wireless charger support" into jb-mr1-dev