diff options
| author | 2023-04-19 11:41:43 +0000 | |
|---|---|---|
| committer | 2023-04-19 11:41:43 +0000 | |
| commit | d0f9d226622a61f004d59f5deea310030a7e35ea (patch) | |
| tree | c0d208d59245015f3a50f21a9f958d149ecf4d94 /libs/androidfw/ObbFile.cpp | |
| parent | a64d31ef63d1c2b680361eef44e89dbfd16bacc7 (diff) | |
| parent | 995bb7e3e6338e624ac7f0886236309f10f1e5a0 (diff) | |
Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev am: a082fd92a4 am: a0237b2e83 am: 7d8fd7a9e9 am: b4ce1ebb4a am: 995bb7e3e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525
Change-Id: Ifb22957a3e0a63a895bfd800325ea238b7234164
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