OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sat, 8 Apr 2017 08:04:43 +0000 (08:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 8 Apr 2017 08:04:43 +0000 (08:04 +0000)
commit146f901c9b22adfed1c265cb4738746f92e01c5c
tree66d8dc47ef0609590429b4149d6e7b7831936887
parent51228baee5430a22656c2bd72865163e5b8a6d4c
parentdf12f01abdc9cfabca5f861cfe1cdafa940439b8
Merge "Import translations. DO NOT MERGE" into oc-dev
am: df12f01abd  -s ours

Change-Id: Iabdc2a26176481290232279bda74f73780d39cac