tree 34cdc72ca65dc1ce56a614b78c74e9e4d8a5f54b
parent 08a5d443fc4df043551d88a4cc04730ae42c90a9
parent 1e91878a86250500a98ffd664f222fb1111c594e
author TreeHugger Robot <treehugger-gerrit@google.com> 1604116195 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604116195 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8c93c6c3d1 -s ours am: 71ca4d10b6 -s ours am: fc39a29bd8 -s ours am: 1e91878a86 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic5b7f4f5856b215849879175c963716e229a7f0f