OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a365d9123c -s ours
authorBill Yi <byi@google.com>
Mon, 19 Sep 2016 18:40:56 +0000 (18:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Sep 2016 18:40:56 +0000 (18:40 +0000)
commitf3154c6763915e2b6ea0213bb838956653914350
treeef797a746b0421ffb5be7796ed048c55374b3f5a
parent4ebeaf09fdc8c12d0f00b835a4fc6f005f3fd9c6
parent8469c012943e3f04ca7a7135c10cd9f522dc02ce
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a365d9123c  -s ours
am: 8469c01294  -s ours

Change-Id: I46a013fa04395eb805c3a451788b981f553b520f