| commit | ec71863dd2795f7b2308b06b749b694eef2e663a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 09 21:26:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 21:26:51 2023 +0000 |
| tree | aa7b15be78904ed3d49b432ff593b70b76d5f53d | |
| parent | 50ccc9ccf413ee33b3ebb1e0f849aa4730ae64d4 [diff] | |
| parent | b4fe928b809312a4c391d324fff30e478bc3445d [diff] |
[automerger skipped] Merge "Added string token to CARD support multiple languages" am: 1c46ad7dfc -s ours am: 9392e58241 -s ours am: b4fe928b80 -s ours am skip reason: Merged-In I90551b705381bee71df837b05bb0f3ff7ea98e54 with SHA-1 8269f7038f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2475012 Change-Id: I2da993a7bafa14e1a20b3f1eceed47cbfdcd8285 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>