diff options
| author | 2022-08-22 23:13:56 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:13:56 +0000 | |
| commit | 7011c29520868dd72eed7d55705849583f05b283 (patch) | |
| tree | 052362b79cfe9db816d1aab816d65b3b3247ae14 /libs/androidfw/StringPool.cpp | |
| parent | b62efe46678bf5f90ef173ffca28419d563b11a1 (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: Ibbced7f7b8636e68e02bf3bcd607e824afc9191b
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