OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f381889844 -s ours
authorBill Yi <byi@google.com>
Thu, 6 Oct 2016 21:41:11 +0000 (21:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 21:41:11 +0000 (21:41 +0000)
commit859d5217c0b182babb8938cfb2a23fcd9cfb1ae3
tree317d290d53e306b421aa5b1c3f071816971383d1
parent54e34e9c7e2961a32e39570534314fa8ad323c47
parentd8ae5393a8d1d3d4f5291cf666b4ea5a5d0d152e
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f381889844  -s ours
am: d8ae5393a8  -s ours

Change-Id: I81703238ee45d425d9962e9bcce76f135b6b6770