tree 2842b4df5a63d285f3a8a7121175800c1b8e5f5c
parent ac0a304d2bf215c37c1878480e13a6de95a5baac
parent 0b551fa42d0ffb94899e4c1492750daf575f9049
author Xin Li <delphij@google.com> 1633683571 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683571 +0000

[automerger skipped] Merge "Merge Android 12" am: b0cc975fe1 -s ours am: 8faa4ced33 -s ours am: 59069153c9 -s ours am: 44e848479c -s ours am: 0b551fa42d -s ours

am skip reason: Merged-In I203c591917c9da5b44f12c9822522e0f4cc15599 with SHA-1 a6ae5c949e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/UserDictionaryProvider/+/1847711

Change-Id: I0aae3f7651b2b84c64cbada527cee89739b3a0a0