Chad Brubaker 3210b8b4da Merge "Add support for debug-overrides configuration" am: f1e813ea33 ...

am: 467804448d

* commit '467804448d6b13e04b4d9bc20fd195baa1f07e90':
  Add support for debug-overrides configuration

2015-11-11 19:30:01 +00:00

..

java

Merge "Add support for debug-overrides configuration" am: f1e813ea33

2015-11-11 19:30:01 +00:00

jni

Merge "Parse method-trace properties only in debug builds." am: 8fa7e93050

2015-11-11 17:05:42 +00:00

res

Import translations. DO NOT MERGE

2015-11-04 15:24:05 -08:00

tests

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00