tree a367ae51fd69ddbdd2b0976bd23c3167581b9409
parent f0910d0ffec016270cb32b56b40068abaac29885
parent 3e9831a5ee8baf396ccfe277a034dc5e626fa90c
author Bill Yi <byi@google.com> 1523891035 -0700
committer android-build-merger <android-build-merger@google.com> 1523891035 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: c0b2032368 skipped: ee1f804c79 am: bf6682b0c9  -s ours am: 6246776c2e  -s ours
am: 3e9831a5ee  -s ours

Change-Id: Ife18db6a039bd78610e6f6275fc6e4117304349a