tree d9e4bd5cd928166ad565f8dab5893a16a4816210
parent d375d075384b21030624890824add37b5c415757
parent cf667ad7d77559cde0416e2f97a60827acf5e73d
author Jeff Brown <jeffbrown@google.com> 1378860036 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378860036 -0700

am cf667ad7: am 2f1ef77c: Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev

* commit 'cf667ad7d77559cde0416e2f97a60827acf5e73d':
  WirelessChargerDetector: Work around bad sensor timestamps.