tree 89ab898ac8ccc2be4887f8f939050bae5b7c6799
parent 1d6a7bd97340eab85920b37c3c83ee66fbebfed1
parent 1ec3c2ccedde5cd8ff6e94c9b1566a913d5e8db0
author Sascha Prueter <saschap@google.com> 1357930429 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357930429 -0800

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

* commit '1ec3c2ccedde5cd8ff6e94c9b1566a913d5e8db0':
  Improve heuristics for detecting wireless chargers.