tree 3e76dc559a3fee222bc6bcec085c52f876a448a6
parent dffacf7ada4c5a1124fb73347c2f73d8e0300652
parent 9657a5717adcc3aa04ce18b187784a0c5d6200c5
author Bill Yi <byi@google.com> 1560480572 -0700
committer android-build-merger <android-build-merger@google.com> 1560480572 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 90b3dabe5c -s ours
am: 9657a5717a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic6c6ca505c75f07524cb726e361ae51e09ae1e0b