tree 47c1465b963fefd38bd925b6802e8e50a5614a59
parent 11768fd80fe62e66df0651b3301315afeb234abb
parent acdedf312261339dee722d9c2a984703e163bf8e
author Bill Yi <byi@google.com> 1532928172 -0700
committer android-build-merger <android-build-merger@google.com> 1532928172 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f am: 843fb76d1f  -s ours am: ffe456e49c  -s ours
am: acdedf3122  -s ours

Change-Id: I61f0ab91a21552f0dc61c7173a971aa07bef88aa