summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2023-01-19 17:44:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-19 17:44:30 +0000
commit2f889908fd40a033823934e863dcda98316229aa (patch)
treedd778ccce06799c39ce40435403d8421be50843c /libs/androidfw/ApkParsing.cpp
parent19993ebd286500ffd432a70a1063d3c4ecbe30cd (diff)
parent26006c72dda345d65f323a2fec8c65a41b7947a6 (diff)
[automerger skipped] Merge "Make ScreenshotRequest handle hardware bitmap conversion" into tm-qpr-dev am: a5e45d3124 am: 26006c72dd -s ours
am skip reason: Merged-In I1041bbcfdc5f5ece6e98bd0844017d4f3dc4e9f3 with SHA-1 414f66073a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20894854 Change-Id: I230dc2f833102b2bc487a541d13c03b00f1e1420 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