Jeff Sharkey 5df7298c59 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp ...

Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22

2016-04-25 15:53:50 -06:00

..

java

resolve merge conflicts of c79a568 to nyc-dev-plus-aosp

2016-04-25 15:53:50 -06:00

jni

Merge "Increase the max binder thread pool size for system_server." into nyc-dev

2016-04-21 00:39:06 +00:00

res

Merge "Add back protected profile availibility broadcasts." into nyc-dev

2016-04-25 18:09:36 +00:00

tests

Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev

2016-04-23 00:23:56 +00:00