tree adfba2ab011072d581e67d2de2c922ed071bb972
parent 7d8ddba233e0884d02c30ee1943bd5a5e421b97f
parent dcdb78835a256c4ec9e084fb384889252a2bc548
author Song Chun Fan <schfan@google.com> 1666139363 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1666139363 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-qpr1-dev am: b66bf1e630 -s ours am: dcdb78835a -s ours

am skip reason: subject contains skip directive

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

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