OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: f15c825dfb -s ours
authorBill Yi <byi@google.com>
Thu, 24 Aug 2017 17:18:37 +0000 (17:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:18:37 +0000 (17:18 +0000)
commit9eab7261061c1bc75b2d53f730ca9e793ac31db5
tree7092bbe0f822a96f5fc9868e568c24025f254375
parentecf3da31242fdf9d794b89f526a13f31ebcdf75c
parente60d71b705076b217c9b784e970efa9f60059566
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: f15c825dfb  -s ours
am: e60d71b705  -s ours

Change-Id: I1fa3b358bae6beb74d0b42528d80e7a95755f86c