tree 4ff56bde1d82e854b68b88e14125510cd2de0608
parent 610f0600a188e6bb87ded4c64b7a1882881fcff3
parent 20036b9221872707fd44c2c8eb7afa511e29a491
author Treehugger Robot <treehugger-gerrit@google.com> 1599294755 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599294755 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 230452873e -s ours am: a3d3942140 -s ours am: b17c0b2654 -s ours am: 4739de1147 -s ours am: 20036b9221 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420411

Change-Id: Ibee3f72b08d1ee555b2b5bc77e23bf60c0cd9a06