[automerger skipped] Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6e0 am: 9338b2de56 am: 8f9b80e5f2 -s ours am: 6c319e05d2 -s ours

am skip reason: Merged-In I3042be0671728d06bf1c7ae09baee538bb82fbe7 with SHA-1 c848cb7172 is already in history

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

Change-Id: I0dceb71b55f893ccf33a62f87aa9765a68a13e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Songchun Fan
2022-04-02 00:48:11 +00:00
committed by Automerger Merge Worker

Diff Content Not Available