diff options
| author | 2022-08-22 22:07:58 +0000 | |
|---|---|---|
| committer | 2022-08-22 22:07:58 +0000 | |
| commit | cc809ffb8a1623200f446c19975a20842fe79ed8 (patch) | |
| tree | 93d63c14446f3a40bfea4f2585debb94b77c9ddf /libs/androidfw/ResourceTimer.cpp | |
| parent | 54f95db1cf290fec919e8c35a08bdee26e4d33a0 (diff) | |
| parent | e718b4ef2073c7238fb33298d336c880d5177717 (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: 87755b712a -s ours am: e718b4ef20 -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: I9ce9cd1ec78eafb8a66ddc09a6af77bac75ccd30
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