Andrew Sapperstein 7fe3adcf26 Merge \"Merge \\"Add colorSecondary theme attribute.\\" into nyc-mr1-dev am: ddb980de05\" into nyc-mr1-dev-plus-aosp ...

am: cd10a1fce1

Change-Id: I645b91c902e1772b40a42b10504316990ef74ae6

2016-06-23 19:09:33 +00:00

..

java

Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e0a am: 803a316d6e

2016-06-23 18:50:50 +00:00

jni

Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e0a am: 803a316d6e

2016-06-23 18:50:50 +00:00

res

Merge \"Merge \\"Add colorSecondary theme attribute.\\" into nyc-mr1-dev am: ddb980de05\" into nyc-mr1-dev-plus-aosp

2016-06-23 19:09:33 +00:00

tests

Merge "Refactor the java side APCT perf test"

2016-06-22 17:05:03 +00:00