OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 4 Jun 2018 17:32:27 +0000 (10:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 17:32:27 +0000 (10:32 -0700)
commit301bd85b5aa967139a923cfe667e10301075b4cc
tree513b531656f3193b1b02e4e50b3302a237e32bea
parent8cadf6d2bf321514a10ff6b64813ea06a227cb33
parent874fab720807bc68a91e9ec7e2a5e908caa1fc55
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 874fab7208  -s ours

Change-Id: I2640ed95dfa28b37365ed77d284c2ce547506b8e