OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 22 Jun 2017 13:35:55 +0000 (13:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 13:35:55 +0000 (13:35 +0000)
commit70c2a7b0d99e14a4760bea6522a1f30055ae3b91
treea6868088f7478ba4ab07d5f5741d659ea9fc09b5
parentca35ed5cb9891c8a9ccc3d2c8f72431d0c112c5c
parent242c3c497c3b79be844713cbe7280f19ddd9f711
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 242c3c497c  -s ours

Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6