summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-22 21:30:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-22 21:30:32 +0000
commit87755b712a99ce4a49db23f28a70f1a5ce8af9b9 (patch)
tree2cd2615a1c0552828488b08f879df5492aaf041d /libs/androidfw/ResourceTimer.cpp
parentc4d258d8b16b636afab7d4b4e3d50c52d5c641a1 (diff)
parenta8fe3a8f50fd805c558e6a65c664460909c6fd83 (diff)
[automerger skipped] [conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am: dedf573b23 am: a8fe3a8f50 -s ours
am skip reason: Merged-In I62a875e26e214847ec72ce3c41b4f2fa8e597e07 with SHA-1 a367c0a16a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19680844 Change-Id: I5de4f2f5b016828231f035aa045a8faf3849d805 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