tree b4f7710b9b8a63664afbc9ed942bc6d8a7382564
parent 1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e
parent cfc893d27a59bddbc5d0da0038e8313f6c379f86
author Android (Google) Code Review <android-gerrit@google.com> 1258576710 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1258576710 -0800

Merge change Icfc893d2 into eclair

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