tree 32324c9c9d10e5e336d87443cee6f87b8e127e02
parent 927396047c16e179f34b69d7404a633999c82777
parent b5af2022094740988a52f31dabea92f51167d947
author Bill Yi <byi@google.com> 1528742709 -0700
committer android-build-merger <android-build-merger@google.com> 1528742709 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: ce28dfa9fa skipped: 4f7095b464 am: 124cc34793  -s ours
am: b5af202209  -s ours

Change-Id: I1a8c18e58b587716dccc478fa188931df79d68c4