tree b664b53a6115df603c0a0172a594747026dc5da2
parent c9ca9d68a39f6c38b832f240518da5d4864cf2cd
parent 533f6cdba6000dd070c83fb6f53eccc314e7f9f3
author Xin Li <delphij@google.com> 1656543396 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656543396 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 4e707b3b03 -s ours am: 533f6cdba6 -s ours

am skip reason: Merged-In I837d7d2478523eae98a5e94d8f640ea04055e35a with SHA-1 c9ca9d68a3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/vcard/+/19094258

Change-Id: Id645b1dd8dd1b8b9181ff9c26c6dd9096271f7a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>