tree 03561309a465284687bc95f126df64ee0c602a2d
parent ee63215903db7ddd32f165f0a5a771700041f1ed
parent 8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b
author Dianne Hackborn <hackbod@google.com> 1285025685 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285025685 -0700

am 8e1b84e7: Merge "Some battery improvements:" into gingerbread

Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements: