| commit | 6c6b990c0998a0373bc3d45dcdaa80737d08f7f2 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Aug 31 21:55:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 21:55:46 2023 +0000 |
| tree | 1d99091cf04f60a765a10b580f520acc4fc9e785 | |
| parent | 86fe4c3ff7f53bd5678e01046d568732a0bbadeb [diff] | |
| parent | 0071e507e712cfe8ed6a35479ecafa1833f7f4fc [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: a039c70722 -s ours am: 0071e507e7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616713 Change-Id: I48b4fc29603b2b50b08237291fc126f29be0101f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>