summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2023-02-22 05:24:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-22 05:24:12 +0000
commit9255a0f3bc4eacdbe7e5c64cf2fa0c864efc18cb (patch)
tree0a233a49d1bf1b6764e2bdfd844bd5d803b269e9 /libs/androidfw/FileStream.cpp
parentc34f0379fefab7b3d5842899b299e2351ef34f30 (diff)
parent6297c432525083eed42bd4cbc78744565d998d99 (diff)
[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into tm-dev am: 3d69645a38 am: 04ce5cc146 -s ours am: 6297c43252 -s ours
am skip reason: Merged-In I666b9ee6b6076766513b97e675fdbaa002428601 with SHA-1 65ac64c347 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21397560 Change-Id: I9b8fc9884f2ffcc977bf88e6f0032bb79e50a992 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