tree 3933c7b7635491ab8da304c0e9f9df24bacff6aa
parent 06908ed009dd9e22ed9e650b6b4cc017633b46ec
parent 318224ae936c1eb352eaf624cdce7f48eeb0218e
author Bill Yi <byi@google.com> 1538381757 -0700
committer android-build-merger <android-build-merger@google.com> 1538381757 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5 am: 0bc949205b  -s ours
am: 318224ae93  -s ours

Change-Id: I67d3e80dfe295f37c8ea3184b4e596fe6a12906c