summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-12-12 14:38:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-12 14:38:21 +0000
commite41d20ad91e6ef97a6885bb50e8bebcd2cbb7d4a (patch)
treec8d0acba87d62cc5c5f17586f63f741a60ea5483 /libs/androidfw/ResourceTimer.cpp
parent6d0fbbcb2748c9da82d40d86f72fcf101bdb76a0 (diff)
parent1cddcb6f4df1ad1e6375914713212e060504e413 (diff)
Merge "Skip onActivityEvent when remote ContentCaptureService is dead or unbound." into main am: 1cddcb6f4d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2864429 Change-Id: I77a06ce5f8fd884d5b95475abdf855a77689c069 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