tree 3933c7b7635491ab8da304c0e9f9df24bacff6aa
parent 1eaac3c4bf855b317b8419c6f8f0afd5ac628b68
parent f7ee9f3f79db0e1b096a0d91463367361f353242
author Bill Yi <byi@google.com> 1538379038 -0700
committer android-build-merger <android-build-merger@google.com> 1538379038 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28 am: 5bf6376615  -s ours
am: f7ee9f3f79  -s ours

Change-Id: I283f5e84bfb8ecfcc7e090c2b775935c0f3204ed