[automerger skipped] Merge "[SettingsProvider] update API javadoc" am: ebcfe1c6e0 am: 9338b2de56 am: 8f9b80e5f2 -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: I4ae6973370d5b82731ee87e443d71f7c83d69bdd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
6c319e05d2