OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae...
authorBill Yi <byi@google.com>
Thu, 20 Jul 2017 20:16:26 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 20:16:26 +0000 (20:16 +0000)
commit1835292a22744ee71d5d1e537fcbcbf1d665d9ff
tree2af03241570f707d4cc9676cdd1cc2c2cfc23ecb
parent43a7927631d059ab28e572d5a2bb6b3a4871ef4b
parent6c3edcd1189d02f459d1798a6cd86d2f1e865eca
Merge "Merge "Import translations. DO NOT MERGE am: 6cf2d99816  -s ours am: cc298f9ae6  -s ours" into oc-dr1-dev-plus-aosp am: 8746483a7c  -s ours" into oc-mr1-dev-plus-aosp
am: 6c3edcd118  -s ours

Change-Id: I9473a5de7493dd65fb6c4cefa0dbe56c1c20ae06