summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2023-11-08 22:13:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-08 22:13:37 +0000
commitc63ab57d5462f685f7108cc97b505db7028d318e (patch)
tree805156c43a76d5dcbe09ca2810218355a3721c0d /opengl/java
parentcc67876979b15af388e67d21c302b8a23d262ff7 (diff)
parent88f4b85c1b1937fadc10cf86f64319d5940a7d93 (diff)
[automerger skipped] Merge "DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses permissions" into sc-dev am: 7ca03665c4 am: 1c935b0dae -s ours am: 74a6b83621 -s ours am: eadacd8f44 -s ours am: ba1b1134a4 -s ours am: d139f3c2ab -s ours am: 36e92073a5 -s ours am: a7a55b3f4d -s ours am: 88f4b85c1b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119905 Change-Id: Ic33f0ff6dce3e686bcd6f058e8008f4d0038fbf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions