OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b98e47c79b -s ours
authorBill Yi <byi@google.com>
Mon, 22 Aug 2016 21:43:19 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 21:43:19 +0000 (21:43 +0000)
commit2b094c46766dfc54ddcd20916d2c79f12561e9ec
tree7e985e5b9a0557df59155c9abd4662c1f43cbf39
parentd0e262ba32ba9ed2c365f038ea4a8ffde574933a
parent0d15b016db94698a8200d684bfeec0df6ecb1e32
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b98e47c79b  -s ours
am: 0d15b016db  -s ours

Change-Id: I0e8a0a446a27c6b1e946829a9f6b895548bdc72f