OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 18 May 2017 23:59:17 +0000 (23:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 23:59:17 +0000 (23:59 +0000)
commitea87948cf9136c1737514c5f9c7761187282b348
tree382c5e23635ec9268c788aba23ef83d3fd9c14e5
parentf332b5dfc8120a9cb85b63cbe4a72b72fa8d3fa5
parentd4c3c6e1b18fd9e39eb74baeac2fd4ab5001cb00
Merge "Import translations. DO NOT MERGE" into oc-dev
am: d4c3c6e1b1  -s ours

Change-Id: I3d2ad4363209ff05fc2dd5f50f0173ff6c748902