diff options
| author | 2022-08-22 23:23:43 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:23:43 +0000 | |
| commit | c14df4ceae356a5821ae3e44f9f7be9211d9e65f (patch) | |
| tree | eb1f9c8fb823dcf842db6d30583f7303fb33ce50 /libs/androidfw/StringPool.cpp | |
| parent | 997f8e0c7e9f7cc5ee545a7d856dad4c4f37a098 (diff) | |
| parent | 0071aaee6797234770c40a720664e1bfccfcd07e (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: 0071aaee67 -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: Icde236e4e15e5bcb4a587dfc8af116e613e80827
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