OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e948fe0769 ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 17:11:41 +0000 (17:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 17:11:41 +0000 (17:11 +0000)
commit2d4acff2953578c54e867782e9d91f423ef3dfee
tree3b53a21d3b383dc34908c5cb27d2931ed4b70b2e
parent8e3586db9d022dcdde5bb028ee3b0f171ded9ae3
parent1cee40b17257a55e6395e0bfe2cbac168a919b22
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e948fe0769  -s ours am: f6136af68f  -s ours
am: 1cee40b172  -s ours

Change-Id: Ie581bd19e8d8aea5a5e9a186b1962b38ff486723