tree f28e964f428e69d36ae63059f7a7d475696bcbf7
parent 8c118064c3921e4e389426ad16163dc41838fe96
parent 7dafb577ccebb9f5900dffec07a2fbd880ece484
author Bill Yi <byi@google.com> 1526798403 -0700
committer android-build-merger <android-build-merger@google.com> 1526798403 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: cd6db9ecb1 skipped: 60f9184f36 am: 6501a185b9  -s ours
am: 7dafb577cc  -s ours

Change-Id: I9777be585c2cdd57cd26890f5007b29f57b803b1