| commit | 24b7ba3636f094deabcf836ad117f225c29523e5 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 12 18:04:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 12 18:04:55 2021 +0000 |
| tree | 95cdb50f232f11d8d828d24b7adb30c7f7586238 | |
| parent | 3f9a6ffbaa71e9955f51368c649f393cae0a0267 [diff] | |
| parent | b524d9932f5e3573d141ae0d3bea11ba22026a93 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 23061f1b50 -s ours am: b524d9932f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15260115 Change-Id: Ia94a5cde562528afd7772b3fbcd24413aa53a989