OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Sun, 5 Jun 2016 15:57:34 +0000 (15:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 5 Jun 2016 15:57:34 +0000 (15:57 +0000)
commit2a3857a810442487fdca0991c62257a1ccc7546a
tree6d99e6be59769165285d51d79830a80491e03ee5
parenta4a9b27641446a74000aa88044208ba951f1355f
parent5ce01c13e541abbc6a3e75b0bbc92699c86b7700
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 5ce01c13e5  -s ours

* commit '5ce01c13e541abbc6a3e75b0bbc92699c86b7700':
  Import translations. DO NOT MERGE

Change-Id: Ifb79ac6a141900634068b04f70c3b85b5bb23385