diff options
| author | 2022-08-22 23:54:02 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:54:02 +0000 | |
| commit | 0c8dcc2ab319b805a13fde795b82698f978d7c6c (patch) | |
| tree | a732e57e4a8a37035f3f499f0fb4d2574fce10a0 /libs/androidfw/StringPool.cpp | |
| parent | 1736183d9747336b2e5f280ff123add76d2a2bd4 (diff) | |
| parent | 88b428e01e7f8e7586552eab46035de7203dd572 (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: cc809ffb8a -s ours am: af7787b53c -s ours am: 64d1908b86 -s ours am: 2e13e27a0c -s ours am: b770b90055 -s ours am: 88b428e01e -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: Ief2b7910c311a1f7008191935f40b42beb053618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions