diff options
| author | 2022-08-22 23:25:37 +0000 | |
|---|---|---|
| committer | 2022-08-22 23:25:37 +0000 | |
| commit | b9037aebd89cddc9439cd159609fe3684f627049 (patch) | |
| tree | aab0d10caf165f815e1ed163d5bcfb2b10a29756 /tools/aapt2/StringPool.cpp | |
| parent | 9cb57b1981b3d2bbb948e969ef5dac61773febdf (diff) | |
| parent | 1c0528d3a5c353edf29b11754faab5b4e29e933c (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: 25601eb7a0 -s ours am: 1c0528d3a5 -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: I2b9cc7ed288c98f4a237a5a12ba87845ed6b158d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions