| commit | e56508d982f3164204ad9b68ad39f34bf8878e5f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Aug 31 23:50:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 23:50:14 2023 +0000 |
| tree | de61f308763f6915abf6d0f5039539c29d339409 | |
| parent | 777a7cd19eb9159b12288c85ca71327c0bc40782 [diff] | |
| parent | 33819c3d70a428de903ef38c71bdcb1e86fb91c3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 6d2fae3224 -s ours am: 1e0c94c10a -s ours am: 1758e6a0c4 -s ours am: 33819c3d70 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24616712 Change-Id: Ifa4e18791be9179b7d4f98b3aa54d3b0b12c4eba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>