Dianne Hackborn a2fabf4d1d Merge "Battery monitoring fixes:"

2014-05-22 17:22:15 +00:00

..

core/java/com/android/server

Merge "Battery monitoring fixes:"

2014-05-22 17:22:15 +00:00

tests/servicestests

Fix build.

2014-05-14 03:56:33 -07:00