tree 1f45fb29de6b2e757e67a4dde724005a67f5f689
parent 59d481a43965d89a912528d56fa77505b5e33834
parent 96caa8600b9b8a026a6cba9c4d58edfc84852b7f
author Bill Yi <byi@google.com> 1529621693 -0700
committer android-build-merger <android-build-merger@google.com> 1529621693 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 96caa8600b  -s ours

Change-Id: I725532127edb1f51097512043f28c9bb152b129e