OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Sun, 15 Apr 2018 03:35:44 +0000 (20:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 15 Apr 2018 03:35:44 +0000 (20:35 -0700)
commitcbb9ab8ad369d5466a0b9b404b08cddfd4927388
treed9c0eea0adee821a9b4515f7ac1fdecb77b6c07d
parent1e916920c50f8d707baf834b9b0ed5b1bc931ba3
parent9470271d8549f26b857508ed1e32986a5e01cb62
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 9470271d85  -s ours

Change-Id: I810c2412aae8c3b92a5c66d4de3494efa22a447c