OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:05:04 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:05:04 +0000 (17:05 +0000)
commitb53c4e68ece0086c9089a29051a32b7ec260efeb
tree8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1
parentc4e25b26defa019041d2e596381be69b7a68210c
parent4233404ee4f33a55dcee898939d19b78e4b027c8
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4233404ee4  -s ours

* commit '4233404ee4f33a55dcee898939d19b78e4b027c8':
  Import translations. DO NOT MERGE

Change-Id: I02e0874f7a79ff45eca3498340e7d19b9d0cdd28