Jeff Sharkey 7f60e70e81 am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev ...

* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
  Detect wedged ContentProviders, treat as ANR.

2013-10-02 09:35:14 -07:00

..

java

am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev

2013-10-02 09:35:14 -07:00

jni

am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev

2013-09-30 17:10:55 -07:00

res

am b9edb3a2: Merge "Fix issue #10971287: Make ACCESS_BATTERY_STATS permission system or signature." into klp-dev

2013-10-01 22:21:52 -07:00

tests

…