summaryrefslogtreecommitdiff
path: root/framework-s/java
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-11-25 18:18:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-25 18:18:50 +0000
commit05526e3a806bda25ccebd73bda1e7d45a6ba83b0 (patch)
treea2c5804151edf0a146fbd583077931aaef6868c9 /framework-s/java
parentaa6dfceb4fb58656a846286bb64fb757a3bf7f7c (diff)
parent6295fe149979da7b5091b87faeec81aa56aca1bc (diff)
[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 6295fe1499 -s ours
am skip reason: Merged-In Ia6b014e41b33c74db2bc9b0c8c360c009dd8ad3e with SHA-1 d338c133bc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/30533868 Change-Id: I8e00c5f2c1810f0f12a07151d1714f585bb5208f 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