diff options
| author | 2022-08-22 23:50:59 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:50:59 +0000 | |
| commit | 38970ca6f6c1bb2ad7bf2552b0ea81ca7bfdd3ca (patch) | |
| tree | 7112c756f9656e29077dabdeb07c70d7ee1edb61 /libs/androidfw/StringPool.cpp | |
| parent | 6c135e2b5c84dbd6decf621c0e3ef828d748e84b (diff) | |
| parent | 76b678acf5463051d52b68614cc8b5ac401d27d4 (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: 7011c29520 -s ours am: 76b678acf5 -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: Ib932120a95c4fb16c452988cdfe4a7cfeddfe70a
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