commit | c0c5e0d79553f4aedb13723b8d5db45d057e32f5 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Aug 07 20:09:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 07 20:09:34 2021 +0000 |
tree | 04dbe191dc594a6891dfe5e048004b74d60e4511 | |
parent | 804bf8701b9d066e0d587ddad43e08cbf9262941 [diff] | |
parent | 3e85943c402d0ee38388c137889bd08886b0109a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 47c721a3f5 -s ours am: a595256e53 -s ours am: b95f4af41e -s ours am: 3e85943c40 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15480961 Change-Id: I3dcfca8f812928f0c94f20ea35973eb9501357c0