OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 16 May 2017 18:51:10 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 18:51:10 +0000 (18:51 +0000)
commitd3dbc35ba753084a5906e9ac6985e8e1e5c1ed18
tree4585b8a697dc0b452f56eebe268e47bfe68ba2ab
parent90c963b1fa263674ad2fd0bef22f80c9f20e87e4
parente11a4d4e86054a589fed819e59bb7b6a08f688f9
Merge "Import translations. DO NOT MERGE" into oc-dev
am: e11a4d4e86  -s ours

Change-Id: I9e6981e64124043f872a0dd6b6679cd4b0021bf5