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 17:03:10 +0000 (17:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:03:10 +0000 (17:03 +0000)
commitecf3da31242fdf9d794b89f526a13f31ebcdf75c
tree7092bbe0f822a96f5fc9868e568c24025f254375
parent1ade98c41420ca91911531ef8384cd2ed8d0fb71
parent0497f43e807a9052da9b70a415be30ea10c3cb98
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7175b7b929  -s ours am: 1c1e7095f3  -s ours" into oc-mr1-dev-plus-aosp
am: 0497f43e80  -s ours

Change-Id: I7bb12539e6be02e39a8b57e293f872cf47432ce1