summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2023-02-22 03:49:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-22 03:49:37 +0000
commit0ed33722d31dd57ef2ea8210bc6aee0bf7fb574b (patch)
tree91fc410c9ffae7fa5bce0b1e058c225b359d14c1 /libs/androidfw/FileStream.cpp
parent1c5a1c4352dcfb4f5ef93385f6db79857a45029f (diff)
parentb5364b0563651a6e7bf296915e39643e1f4b99c6 (diff)
[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into tm-dev am: 3d69645a38 am: b5364b0563 -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: I8c1f1127cdd95e71a5b8285fd4758dce5d67cf59 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