OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 8 May 2018 18:34:33 +0000 (11:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 May 2018 18:34:33 +0000 (11:34 -0700)
commit8f6ce29b1a196a92ea0641bc4370e9c75bde6717
treec9e19de1e18b1308f0dbc596d16d1f67a762fd2f
parent17348a9a8d0fafcbccb38cb35a225e03ddcde4f3
parentc2db8716e2435bd35a57d14048846ddce1243311
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: c2db8716e2  -s ours

Change-Id: I514ae888940f66c8ec4895ab06c3b1eed29af41f