tree 4b2cafc4378ac5ba5b7117ef16e4d0100adb96be
parent 2d255b7e1fb1cb1ceb64a962f672f145eab585e8
parent b5e4835e3a4ff37693891a59841fcefa5c3aa648
author Sascha Prueter <saschap@google.com> 1357845293 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357845293 -0800

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

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