tree f82f206abe911953e78c517f659e13f4ff7e79fe
parent d6ddb51b3d4ec1bb2e6305823681cdeb05c0ea7b
parent d692ea6dd297fbd39885525a29bdf6637a3640f2
author Sascha Prueter <saschap@google.com> 1357845411 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357845411 -0800

am d692ea6d: am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev

* commit 'd692ea6dd297fbd39885525a29bdf6637a3640f2':
  Improve heuristics for detecting wireless chargers.