OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d -s ours...
authorBill Yi <byi@google.com>
Thu, 8 Jun 2017 23:04:00 +0000 (23:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 23:04:00 +0000 (23:04 +0000)
commit7bbe0bb66a70c9a494fa8f25810b83b713bbc00d
tree1498c73f0a4a374bc8ed53bcd67326d649630f1a
parentf79033a8d1995bf952967f8892321d60a45d3041
parentac1e953b785495a19694f480d76cebb5de7629bd
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d  -s ours am: 5679e1cc6e  -s ours" into oc-dr1-dev-plus-aosp
am: ac1e953b78  -s ours

Change-Id: I6e3f190769ace99cea5e66cb3902f17fdc073324