tree ae96d35c900032cbfb64b95543b102b2f2257faa
parent a33dc507eab88dc09ed5c0032d7af15399c51bdd
parent 251a4aa05bbc35f0e6fa7a668e3862ba86e0190f
author Bill Yi <byi@google.com> 1569472168 -0700
committer android-build-merger <android-build-merger@google.com> 1569472168 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 251a4aa05b -s ours
am skip reason: subject contains skip directive

Change-Id: I773bb8bc2ab1167200a41f6645b5ba4650fd4514