tree c72a58ab5f87e650cf7e8d2799b825b1aad25a9e
parent fa8625074e34887d021fc5c18a9062b94e110ca0
parent 8caa925c98bdf77c795e938742230edb184372ed
author Bill Yi <byi@google.com> 1558763830 -0700
committer android-build-merger <android-build-merger@google.com> 1558763830 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7de69e1710 -s ours
am: 8caa925c98 -s ours
am skip reason: subject contains skip directive

Change-Id: If2a38f3a2a1080339ecd9f629a54188eab8170d5