OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 2 Aug 2016 10:05:31 +0000 (10:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 10:05:31 +0000 (10:05 +0000)
commita42e6f0b211c5b0b4f60a412e2069cb906d5340a
tree8e3fd1e626f71710f587e42e5dbf6a72c632d4e4
parentaf4254f79fbbb770138e7323424f197f7b5f1ba9
parentc1b853ebfba7b8ff67919bb43dd73c80074d1a3b
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: c1b853ebfb  -s ours

Change-Id: I40b296ff7928f4fed612f98b0421550a3da42ef6