tree d0fed48d1aa6ab8e7e8ab62c1660ee80c3a30880
parent e8f212c33f341897803d91eb5fab70fea50502a1
parent 35a7cf0f7ed913cf2b9ec28de46b995e062f0c04
author Treehugger Robot <treehugger-gerrit@google.com> 1657749194 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1657749194 +0000

Merge "Added the annotation for upsert function" into androidx-main am: 35a7cf0f7e

Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2151996

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