summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2023-04-19 13:50:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-19 13:50:43 +0000
commit80b7a1b305a127d4ce6f4f66147dde293b26a223 (patch)
tree102ff17b121f6da5f86d955fb929672f8f0cac6d /libs/androidfw/ResourceTimer.cpp
parent619bbdeeeb214e841a4eff68c224375ebabe7f7e (diff)
parent8ce8e5e1b44d6f0763c460c8d44877b19ecffca2 (diff)
Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev am: a082fd92a4 am: a0237b2e83 am: 7d8fd7a9e9 am: b4ce1ebb4a am: 995bb7e3e6 am: d0f9d22662 am: 647716eb85 am: 8ce8e5e1b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525 Change-Id: I0c5c693146fbaf47ba346b7b3e86555d9a5fe8e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions