OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 04:54:33 +0000 (04:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 04:54:33 +0000 (04:54 +0000)
commitb9cc1f603cd61838779991526f713992a09b3ca8
tree2ac78c6d576522f86e740b642d029f09efabf341
parent18608133d8b60d493de33333ae08af7231f8cfef
parent696b0e4d9fbc5105bf471ba337215c387f577b85
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 696b0e4d9f  -s ours

Change-Id: I807ae6a4f2808825e8363104e8e8661d5de77a2b