commit | d9309345fab9377b7555a91cd7c87a30b3879e29 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 20 22:27:26 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 20 22:27:26 2021 +0000 |
tree | c417eefa52e12c1546215c892dd2ff80ab8f6f2e | |
parent | b4a835f9bb6d5193df200cce17fa3a9a4c4f118f [diff] | |
parent | 82d55973d56f36fa80c0908f8f8bf500f0770a2c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 681902373f -s ours am: 82d55973d5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643359 Change-Id: I20a61683536114a9a2179702eb82fd5a2a9af2fb