Dianne Hackborn bcaffd0586 am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev ...

* commit 'da4a186f8bf49d8ea06d5ad6d402d9b073ee3841':
  Some battery stats history fixes.

2014-06-03 17:16:01 +00:00

..

java/com/android/server

am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev

2014-06-03 17:16:01 +00:00

jni

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

Android.mk

…