diff options
| author | 2022-08-22 21:49:06 +0000 | |
|---|---|---|
| committer | 2022-08-22 21:49:06 +0000 | |
| commit | e718b4ef2073c7238fb33298d336c880d5177717 (patch) | |
| tree | 9db3d05d99ed62378759d6520ae34b3089ea38e1 /libs/androidfw/StringPool.cpp | |
| parent | b6cff0c1757c0a02675f8ea162784181de7c0cd9 (diff) | |
| parent | 87755b712a99ce4a49db23f28a70f1a5ce8af9b9 (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 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: I35814b3bd0ef8796f4643ed1010846803557cb8e
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