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

am: 0bf31c3fa6

Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c

2016-06-22 19:17:43 +00:00

..

java

Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev

2016-06-22 19:17:43 +00:00

jni

Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev

2016-06-21 19:27:33 +00:00

res

Import translations. DO NOT MERGE

2016-06-21 00:24:26 -07:00

tests

Merge \"Fixed notificaiton Stress Test\" into nyc-dev

2016-06-21 20:47:29 +00:00