[automerger skipped] Merge "Update api-lint baseline for NO_SETTINGS_PROVIDER" am: 2ba0a25175 am: 0d24b81c34 -s ours

am skip reason: Change-Id I4e1d6c419c79663a47341cf26d5229ec17b9ca01 with SHA-1 a664a9017f is in history

Change-Id: I7afd3f1650d2f2afa565f3f79a958c1b0c8f5d3c
This commit is contained in:
Makoto Onuki
2020-05-28 17:18:51 +00:00
committed by Automerger Merge Worker

Diff Content Not Available