tree ee2a3d5dfe69e5353d64c8daf5d4502f36a3752b
parent 1b571746a2ff37e35e624a6b8095b306e4d11ae6
parent d6521bbe73087f848db430a6081ab8d8f74320cf
author Bill Yi <byi@google.com> 1564682310 -0700
committer android-build-merger <android-build-merger@google.com> 1564682310 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: d6521bbe73 -s ours
am skip reason: subject contains skip directive

Change-Id: I298b358faa204de48a5436211b08b121f7b59c73