tree e340a68a93aa001852653fe5c0bbbfbe08c9c978
parent c8eb3b41d5ade3d0900d617d518a7b7b673a01ad
parent 28608bbb2fb6daf3d261cb10eaeb1849781cf77d
author Sascha Prueter <saschap@google.com> 1357845560 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357845560 -0800

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

* commit '28608bbb2fb6daf3d261cb10eaeb1849781cf77d':
  Improve heuristics for detecting wireless chargers.