diff options
| author | 2022-08-22 23:24:22 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:24:22 +0000 | |
| commit | b770b9005577b951676194a23d357b7b454607b6 (patch) | |
| tree | ed8ad8c8486dd33a61fb5ae1d0c256578338c68a /libs/androidfw/StringPool.cpp | |
| parent | 4965ef5e8985e450ca02de4d33d348c46df311f7 (diff) | |
| parent | 2e13e27a0c085329c2d917e9b3e57d19da38d9cf (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 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: I85d1fdbd23f85ada51c9857dbd5aeff73bb38f0e
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