OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 15:45:40 +0000 (15:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:45:40 +0000 (15:45 +0000)
commit49cc0fd2f8d7c5e240c76c71171508e7942ed3af
treeb4d58817d9c4e995fe978578889d563149ba3b9a
parentb8235888361dfe0c7be345d93e44bb48d30c60c2
parent422b17438b0d4d95635d87189475e15b27381f8f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 422b17438b  -s ours

Change-Id: Icdd126fb90cdce54c2bf44e1ef924c8ea19951f0