OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 374343...
authorBill Yi <byi@google.com>
Mon, 21 May 2018 18:35:29 +0000 (11:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 May 2018 18:35:29 +0000 (11:35 -0700)
commit12ca1f97836ea4f472003a748c2b70d64d8258e2
tree0380318a1a7bde512429e47612e9a9fcf0b03232
parent3c7e92890bb1de330c6d810797568bfe8df6a46d
parent30478663485d3c55a98f5035b8231ec11289675c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3743438f5e  -s ours
am: 3047866348  -s ours

Change-Id: I807d5fc4dec148159c2dcd57292b7dc6661491bf