commit | 4194726b01856b224bfcc8b98d0a34e2cd59a1d5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Aug 31 21:55:13 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 21:55:13 2023 +0000 |
tree | 1d99091cf04f60a765a10b580f520acc4fc9e785 | |
parent | 77acdb7f72f5c07a8d257e374a90bc01541cfbe7 [diff] | |
parent | acc2b573b8c3332dc66acaf97113dbc7dfdad21a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: a20eb8f4c3 -s ours am: acc2b573b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616621 Change-Id: I2107b71f07b6b8ba40e1dc41790c9b1d2565a541 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>