summaryrefslogtreecommitdiff
path: root/framework-s/java
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-11-13 22:25:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-13 22:25:50 +0000
commit25926ff5ec9de7a3351d1215ae8231c274016599 (patch)
tree73069da4af111140b3a154491fb7bf393c6b7cf9 /framework-s/java
parentaad3eb87aa5a99765d82617d968f2c21886edd0b (diff)
parentb8a728881f0fb2322f7770c576610a8cf511d759 (diff)
[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: b8a728881f -s ours
am skip reason: Merged-In Id58a7f7b92d20ec167fbf0b12c907848bf9a3823 with SHA-1 b9b5df03cc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/30283803 Change-Id: Iefe181de6ec00a19b0ad53bf8d15b7a83d8ae448 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'framework-s/java')
0 files changed, 0 insertions, 0 deletions