Merge change Icfc893d2 into eclair

* changes:
  Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
tree: 5cf1b88e84f34deaad703bc7c8bc80cf8acf1414
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE