tree 11eaf173f45325f2cc468fa25b9d2f27e496448e
parent a7d145a7aef8c33fd8a19b78ff31551f70035db3
parent 1f93cdf8bae44119827654070770a2fb017ec39f
author Song Chun Fan <schfan@google.com> 1666146758 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1666146758 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-qpr-dev am: fec4943a78 -s ours am: 6c3388db3b -s ours am: 898ea3069d -s ours am: c3e202e52a -s ours am: 2fabff2d82 -s ours am: 1f93cdf8ba -s ours

am skip reason: subject contains skip directive

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

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