Chad Brubaker ff400f3229 Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev ...

am: 8064b4a687

* commit '8064b4a687b41377bff5ea767dedc9c8a366cb51':
  Allow debug-overrides to be specified in an extra resource

2016-03-09 20:50:14 +00:00

..

java

Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev

2016-03-09 20:50:14 +00:00

jni

Merge "API to query which cores are exclusively assigned." into nyc-dev

2016-03-09 10:31:03 +00:00

res

Import translations. DO NOT MERGE

2016-03-09 08:22:39 -05:00

tests

Merge "frameworks/base: Remove unnecessary core-tests dependency" into nyc-dev

2016-03-09 07:25:44 +00:00