am 7b5cb3c0: Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1

* commit '7b5cb3c033f758368580664a8bdad43b47f3682d':
  Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl...
tree: ebd08c379454e3064eb73207d60147d16406c2ad
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE