OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:32:32 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:32:32 +0000 (18:32 +0000)
commit10d2fa1ab5f968a2feb04393dc9f3a66d9c899ce
tree8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parenta68b3e37d758f0c305e0848f89a2ace8c691d3a9
parent86ce04b6e0242b16c5c7b756a0bcfb0539e79667
Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours
am: 86ce04b6e0  -s ours

Change-Id: I5fc1263b33bd46044de5d9c3576d190983b5e20a