tree 7845c43fd30484b450d101f924bc70d1b7f6c8f8
parent 96bf4875ab792e34864ed9a7c4e23a2af6c3e314
parent c57be7f300f774933752a7f0c72cf040d4f44810
author Mathias Agopian <mathias@google.com> 1280172601 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280172601 -0700

am fed3c364: am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread

Merge commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248'

* commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248':
  Report sensor events to BatteryStats service