OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f...
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 05:11:20 +0000 (05:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 05:11:20 +0000 (05:11 +0000)
commit64d92dc381366ced25ddd31b6acc864580c1671b
tree3bd0b376a6b583489378d108231b636734318a62
parentd7546218b56d617ae7f8e18af37a0259bef04aaa
parentd37981be5a1d798846a422944ddd43b6d5f8a1a5
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours" into nyc-mr2-dev
am: d37981be5a  -s ours

Change-Id: I847bb6ba0d87353748f4506502f5d17d0f93d035