OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 19:27:00 +0000 (19:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 19:27:00 +0000 (19:27 +0000)
commit469a4ce1d298081f1622e3d72d831b194f0d2a01
tree819bb55b2435dcb074fe0112c0de55cd17e96588
parent2a3fcd8c9fb6f3c1660ab876f60f98e639f84de6
parent299491afe19c6fd651c0d0ddf59dbb8b6c44f451
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 299491afe1  -s ours

Change-Id: I08cce5c324d11d7cdbd9935a83593edada6d57c3