diff options
| author | 2022-08-22 23:05:28 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:05:28 +0000 | |
| commit | 0071aaee6797234770c40a720664e1bfccfcd07e (patch) | |
| tree | 487d9eeb298a006c25f042aaccd29828e25b4db9 /libs/androidfw/StringPool.cpp | |
| parent | e8959e2b5844a28d843b168f2064bec964eb2d57 (diff) | |
| parent | 64d1908b86fe2a5feb3d02ed68bb575f0b6eb75b (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 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: I6540e33cee78414e62fa34d9ee1bea7c322406ff
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