tree e236d53036251d5b2221b234c95ebcdb8909850a
parent ae561ffba9bbc9bd74c39fd859ca9e38fdd4f4bf
parent 7cf55f2a69c32eb5e46c3a9be96f140e827ecbd7
author Bill Yi <byi@google.com> 1558756230 -0700
committer android-build-merger <android-build-merger@google.com> 1558756230 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 7cf55f2a69 -s ours
am skip reason: subject contains skip directive

Change-Id: I10e7eed74bfeaa80eb04095af771598c546fb3bc