tree d5d8afda55ebbeb886aebc62d0e0bbc6706fac79
parent ebf972a5bb4d0c245bc682b643d794b7fc27d9b6
parent 38c8324fda33ab7442b6b4d55c9808da43058c24
author Treehugger Robot <treehugger-gerrit@google.com> 1599284949 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599284949 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 39695933e7 -s ours am: a49c29bd17 -s ours am: b8da09b396 -s ours am: 38c8324fda -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2c1a2ca0c8e68d1f6010383200ad950e61edd551