OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7 -s ours
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:32:05 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:32:05 +0000 (18:32 +0000)
commiteb4bd930d8c4f839142c8a90c83cbe580d5dd419
tree25e090f9cc465aea0761ee721fcde3aadf0f3556
parente10f85d7ac4e47473ed16f97f01a8dfb876bc57e
parentacb237644c07eef292d3e597546589d46f19c0d2
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7  -s ours
am: acb237644c  -s ours

Change-Id: I5ab7471088651c3dd11c48abc495c73e826a1f5b