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)
am: 6c3edcd118  -s ours

Change-Id: I9473a5de7493dd65fb6c4cefa0dbe56c1c20ae06


Trivial merge