OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 18 Aug 2016 01:28:19 +0000 (01:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Aug 2016 01:28:19 +0000 (01:28 +0000)
commitb024dd7501eb27fe3595818abfe750873e1d23de
treeb7a4ad628aab5c813fcefc6b441f9d0caf8bc679
parent6d90bbbc6cf4786fb21bb71d8746d98ec430644f
parent4b30053edeaa8d23b0969c5e6ba2d0184323b549
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4b30053ede  -s ours

Change-Id: I28c7df17b56064d5d267de60a0821ebd409b910b