Svetoslav Ganov 235411a3bc Merge \\"Fix a race in local settings caches\\" into nyc-dev am: f4ddb7ce30 ...

am: ee4c0a3c7e

Change-Id: If795ce9ea8fe36c9919170d0ded12bf488fb8a49

2016-06-18 00:42:16 +00:00

..

java

Merge \\"Fix a race in local settings caches\\" into nyc-dev am: f4ddb7ce30

2016-06-18 00:42:16 +00:00

jni

Merge \"Move SurfaceView offscreen if the app stops drawing it\" into nyc-mr1-dev

2016-06-17 20:20:38 +00:00

res

Merge \"Update manifest shortcut XML schema\" into nyc-mr1-dev

2016-06-17 20:40:16 +00:00

tests

Merge \"Update enable/disable code to reduce flakiness\" into nyc-mr1-dev

2016-06-08 23:33:47 +00:00