tree 1757f1ed73f0bfb1ddf2ceb100623f1a2b158f87
parent acd81744b9b0386986c4fa29b291ad2293f86bc8
parent 3f519896d28d6bfd07c0d1cebad60bea806f9dc1
author Bill Yi <byi@google.com> 1558192332 -0700
committer android-build-merger <android-build-merger@google.com> 1558192332 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 508b5486f4 -s ours am: 06ad738ac3 -s ours
am: 3f519896d2 -s ours
am skip reason: subject contains skip directive

Change-Id: I80dc6322d1e89f9b66960e7635d78103fd6fcdb0