tree b82b24438f72c435859e1a249967e132189edb84
parent 62fcf822c01d89e912eb0c1a920e254d90e8f2d3
parent 7609e2361298178e2ed1e3e4de35ca7a77caffd6
author Bill Yi <byi@google.com> 1528767800 -0700
committer android-build-merger <android-build-merger@google.com> 1528767800 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe am: 6d30123999  -s ours am: f9efc3043a  -s ours am: 9e7657c13d  -s ours
am: 7609e23612  -s ours

Change-Id: I556cc2268f3feb0344b21be2f4a57cd15627047d