OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7175b7b929 ...
authorBill Yi <byi@google.com>
Thu, 24 Aug 2017 16:45:37 +0000 (16:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 16:45:37 +0000 (16:45 +0000)
commitb4d791d585e7d5077710a2d5728e9316f679947a
tree7092bbe0f822a96f5fc9868e568c24025f254375
parent4a4db678aa809fd3695a476d488dcb51fc5b53e1
parent42eb53372dfd2c283b01df7f1dd247a1fc5d8889
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7175b7b929  -s ours am: f8376b0642  -s ours" into oc-mr1-dev-plus-aosp
am: 42eb53372d  -s ours

Change-Id: Ie8b31c81f534d170332c1d50c6235c568e6f32bf