Marco Nelissen 05f56fc121 am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev ...

* commit '95867a652410b5f0193cf301f5737381bcbd3a88':
  Add PowerManager method to assign blame to a single uid

2013-10-03 12:19:42 -07:00

..

java

Merge "Add PowerManager method to assign blame to a single uid" into klp-dev

2013-10-03 16:34:57 +00:00

jni

Fix issue #10948509: Crash in procstats when there is no data

2013-09-29 17:14:15 -07:00

res

Merge "Import translations. DO NOT MERGE" into klp-dev

2013-10-03 03:41:26 +00:00

tests

Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 21:11:31 +00:00