summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2023-11-07 00:36:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-07 00:36:43 +0000
commitde9da704b9d2c887a8995f84ea23cc5b1a6d5b75 (patch)
treeff7c6e8cce370d67de04523c69ee818a23ff0743 /libs/androidfw/FileStream.cpp
parentca2fd61a5254daac1b9c8fc5d24f920f28bb54c1 (diff)
parent928b8c14a39c2c134d8239c472931c62e7750fa9 (diff)
[automerger skipped] Merge "DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses permissions" into sc-v2-dev am: 2bc772d336 -s ours am: 65432f2161 -s ours am: c4f596b4e0 -s ours am: df6bbfa0d3 -s ours am: 32c6aa74c8 -s ours am: 928b8c14a3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25124582 Change-Id: Ia629189cdbddf2accf6607969afc227f07c2fd10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions