tree ad08c4497f5c9b8970298bdc07fed54f6544588c
parent 638c25581a16695995e2e4ccad9865bbff9fe099
parent 76fb088271ecb719ad69ce4b507371681c43bdc5
author Bill Yi <byi@google.com> 1536831188 -0700
committer android-build-merger <android-build-merger@google.com> 1536831188 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 4361fd1517  -s ours
am: 76fb088271  -s ours

Change-Id: I8f5460513a442dd494a632e17be45c352e5abf34