commit | 9392e58241d5f5800dd439d85507c598195d3759 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 09 21:08:52 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 21:08:52 2023 +0000 |
tree | 28a5942be4dc611a89738428737aea80d2091b8f | |
parent | dbf42d157c7793f40e2923315ee20e7dd5494c83 [diff] | |
parent | 1c46ad7dfca1e8b512cbfc8d024ea4dd78ad4ac8 [diff] |
[automerger skipped] Merge "Added string token to CARD support multiple languages" am: 1c46ad7dfc -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: I62bca76a0c74c88ee6aa7df147b161660ae204b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>