diff options
| author | 2022-08-22 23:06:22 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:06:22 +0000 | |
| commit | 25601eb7a0838ace6693aafa0958fdaca0a19e38 (patch) | |
| tree | b40846c1bd6fdfe288a41bb61da3f885d82c6ea9 /libs/androidfw/StringPool.cpp | |
| parent | 2e13e27a0c085329c2d917e9b3e57d19da38d9cf (diff) | |
| parent | 70e548140b0ca9ca2d04762ed31d936f7c478abc (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 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: Ic89bb01e5e9ce145fa8aa6d7f5ecb3343bf81f4e
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