The Android Automerger 750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

..

java

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

jni

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

res

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

2016-04-27 19:58:01 +00:00

tests

Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b

2016-04-26 18:54:37 +00:00