summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-07-10 12:36:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-10 12:36:20 +0000
commite6ac1838482a36aa3626c1c059c118294411e877 (patch)
tree65419d94f4ea9b0727c5e330cc8c5ed2bc7a5158 /libs/androidfw/ApkParsing.cpp
parent6ebc0c9e1f2f8d4a13e725172b42fcaa3ef4ed43 (diff)
parent649ef50446d2f73d07bada3c66870834b653da15 (diff)
[automerger skipped] Merge "Improve user handling when querying for resumable media" into rvc-qpr-dev am: 3b8eb303ff -s ours am: 8bcc296564 -s ours am: 4c58d503e6 -s ours am: 92019fc099 -s ours am: 3a5c79c3f6 -s ours am: ddb8d9e6f9 -s ours am: 8ff98e96b1 -s ours am: cbba85d233 -s ours am: 649ef50446 -s ours
am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 8dccce4f51 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23861195 Change-Id: I569a3989cf026090aec2d4adbab2a0101f8620d4 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