tree b14f65951aba8eae624c76201472060210c5839b
parent 2046650a7d6ee74d9550663a945e0e5dd35d0f1f
parent 5c3ce404b99e0e76c1ab46980244b8287d898255
author Hyunho Shin <hhshin@google.com> 1644889378 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644889378 +0000

[automerger skipped] Merge "Add entity uri field to Eab provider" am: cb2d34eeef am: c991596ab6 am: 5c3ce404b9 -s ours

am skip reason: Merged-In Iade00e57e0b18be89afb4808b901455a412c687a with SHA-1 b32f2e76a5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978090

Change-Id: I5c556efa735028c4b2bf4387195ad47283c8f900