[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev

am: 2d2288f37c  -s ours

Change-Id: I496ac1555af61b6f2e8a52074e2416ad1113a320
main
Bill Yi 2018-12-28 14:10:47 -08:00 committed by android-build-merger
commit fde4ac8f22

Diff Content Not Available