tree 869cc209a508d8d45655bb1940bf8ad6f4d97767
parent 93c0b5cb9b64bf1cffea1f5b8d0ecb1c69ab358f
parent a42402d05ea580b8e6e712bc599af6b8f96395b5
author Amith Yamasani <yamasani@google.com> 1258578653 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258578653 -0800

am 778f1e65: Merge change Icfc893d2 into eclair

Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2

* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices