diff options
| author | 2022-08-22 23:52:44 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:52:44 +0000 | |
| commit | a4442eefb4fca90f579716959ba1a9e7b2347caa (patch) | |
| tree | a732e57e4a8a37035f3f499f0fb4d2574fce10a0 /libs/androidfw/StringPool.cpp | |
| parent | 829d94e41cacd9a7ae7ed04f52a61bce7b2df8a5 (diff) | |
| parent | 6c135e2b5c84dbd6decf621c0e3ef828d748e84b (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: b62efe4667 -s ours am: 3b2cba2340 -s ours am: 6c135e2b5c -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: I29c877dfea3681a293682c19964aedee3290e7cb
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