Adam Lesinski b5c8a98b76 Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: a72a6aae37 ...

am: ce71c120df

Change-Id: I93c1714ded50dc0233185f68b08b7b7803cfc264

2016-06-22 21:22:15 +00:00

..

java

Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: a72a6aae37

2016-06-22 21:22:15 +00:00

jni

Merge "resolve merge conflicts of 79116da to master"

2016-06-22 21:17:45 +00:00

res

Merge \"Merge \\"Add some themes to let Settings use DeviceDefault.\\" into nyc-mr1-dev am: d46ae2f7ed\" into nyc-mr1-dev-plus-aosp

2016-06-22 00:55:17 +00:00

tests

Merge "Refactor the java side APCT perf test"

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