tree edd1378fb53dbdef977d1ddd9cec554a9eb09b3c
parent b31a353214b1842bcaad2a71a299d65d2223d827
parent e2e8fc08e6c22c5eec71e448df9b9be85f30339f
author TreeHugger Robot <treehugger-gerrit@google.com> 1666163897 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1666163897 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-dev am: 01effff444 -s ours am: fdb48f4e5d -s ours am: 3e23e5392a -s ours am: 2564f563d4 -s ours am: 0dd797b4dc -s ours am: e2e8fc08e6 -s ours

am skip reason: subject contains skip directive

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

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