diff options
| author | 2022-08-22 23:24:42 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:24:42 +0000 | |
| commit | 76b678acf5463051d52b68614cc8b5ac401d27d4 (patch) | |
| tree | ed8ad8c8486dd33a61fb5ae1d0c256578338c68a /libs/androidfw/StringPool.cpp | |
| parent | 3b2cba2340c71efd02c7dcddae515bab9b636cf4 (diff) | |
| parent | 7011c29520868dd72eed7d55705849583f05b283 (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 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: I693c6493fa7613bbc9ee3603e22413332bc8d8a7
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