summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Nick Chameyev <nickchameyev@google.com> 2023-04-06 10:40:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-06 10:40:51 +0000
commit04a8199bb4193596dcd9d8ced927240a15bc52e8 (patch)
tree6ca648215287d8ba4c17d223664434eb10e69c8f /libs/androidfw/ResourceTimer.cpp
parent0031367cfa82cba7fc76c37676c9900a3df82d22 (diff)
parent4fd9bddbc36f6178945bb51c8d472cd5e5004108 (diff)
Merge "[MediaProjection] Finish permission activity if dialog dismissed or cancelled" into tm-qpr-dev am: 4d6d94f8f4 am: 4fd9bddbc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22478222 Change-Id: Idea168012b83a5e2789700a3f0c2a739d60a661a 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