tree d9534d9f946bdb34d494eb1c6a5fa63a2314f0fc
parent 9bb7bf18aa12fe3cc29d708a3916358e2129c2a6
parent 36d0f3141d667a2543dd2e83271b20406016caa7
author Bill Yi <byi@google.com> 1533392421 -0700
committer android-build-merger <android-build-merger@google.com> 1533392421 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 36d0f3141d  -s ours

Change-Id: Ic18ff5a653501f7537b3c4eb053103fef2c9b9a5