summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-28 03:18:47 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-03-28 03:18:47 +0000
commit590c89ffe6901de1584126de72a6a3a6c0601346 (patch)
treef3f0a9abea06c19a2e3a63f1abaf01c39b47c6ec /libs/androidfw/ApkParsing.cpp
parent33d19170897367f345aee66482673e45e971f5db (diff)
parentbea32d434bb7d78243ba12a37ffbf99d5b01f3a1 (diff)
Merge changes from topic "am-2472d72054c44ea490577c83dbdd7020" into udc-dev
* changes: [automerger skipped] Use PendingIntent for media click action over lockscreen am: 223e9c5839 am: c4ac6f9eb7 -s ours [automerger skipped] Update ActivityIntentHelper to use PendingIntents directly am: 3ee3b7a20a am: a36d3be009 -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions