OSDN Git Service

Merge "Import translations. DO NOT MERGE am: 1df9bbaafe -s ours am: 6cc2a9cdc2 ...
authorBill Yi <byi@google.com>
Tue, 26 Sep 2017 18:51:35 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 18:51:35 +0000 (18:51 +0000)
commitc3bae5c8b76dd2ed9d20719f62d43555250820f2
treed4bfa8e106734b74beebbd3b976e663c6425d67b
parent2cdb576a5a15ee9cb8d2c6f001fcc493c64c188e
parent3ebe42353b25bf9907a4ad6aeb839d63a86544c9
Merge "Import translations. DO NOT MERGE am: 1df9bbaafe  -s ours am: 6cc2a9cdc2  -s ours am: 5cf5642cbd  -s ours am: 7b3e838ec1  -s ours am: 44b2b486ae  -s ours" into oc-mr1-dev-plus-aosp
am: 3ebe42353b  -s ours

Change-Id: I27171f119e96a7022924e3326c3e24358099c453