summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2023-02-22 02:55:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-22 02:55:34 +0000
commit9b635c55542ded963bafa06ba795d5a16ed01088 (patch)
treeceb2b00e4683605ca3e55b6b550d5c137c3ff63c /libs/androidfw/ApkParsing.cpp
parenta99600d800ce3c7bf14fd3dba636c6bc3316e061 (diff)
parente14be8b3d5ad3fa30d45f078e1dc564b2e365f19 (diff)
[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into sc-v2-dev am: b70d57a0ef -s ours am: e14be8b3d5 -s ours
am skip reason: Merged-In I666b9ee6b6076766513b97e675fdbaa002428601 with SHA-1 6d848929ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21398181 Change-Id: Idc1edb174980bd58a46c49c94a5162190ac5542f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions