summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Kevin Han <kevhan@google.com> 2023-08-18 19:47:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-18 19:47:04 +0000
commit41d853415fd79dc46d0fecd953cf982c3e1d9d53 (patch)
treea8e2a4714c94928b061883b7001304076e737f7d /libs/androidfw/ObbFile.cpp
parenta0e27a10903e8f5af8cf54f7914cb8b5b68a840c (diff)
parentf7cf56ef4a5ae02a48b68cb84af6371045d4eba2 (diff)
[automerger skipped] Merge "Remove pinned tasks when starting locked task w/ intent" into udc-qpr-dev am: b8ccc196dd am: f7cf56ef4a -s ours
am skip reason: Merged-In Id7386eae96cd014bf41ab3c4184ba9f3a79bdf10 with SHA-1 6b6d5b9ab3 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24470739 Change-Id: I5ddef8b34dc5e574239f1dc933ef13f37ded1f90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions