diff options
| author | 2022-08-22 23:52:09 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:52:09 +0000 | |
| commit | 99fe5cd67cfc0cc4c190f096ebae9db5b26fc611 (patch) | |
| tree | 7112c756f9656e29077dabdeb07c70d7ee1edb61 /libs/androidfw/StringPool.cpp | |
| parent | b5aa6606a17406a07f75e71969da601c9bc1d8d0 (diff) | |
| parent | 1c5e44847170c1c69008766b7f50427678171f60 (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: 066e4983c0 -s ours am: 57c20cfad4 -s ours am: 70e548140b -s ours am: 25601eb7a0 -s ours am: 1c5e448471 -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: Ifc739fe20dda849dd56e968a8580f1e3d69422c1
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