Merge changes from topic "am-f996f75544d04cde914909092e4508ff"
* changes: [automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into tm-dev am:7293df1ee9am:acdae48f33-s ours [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am:de2ba563d7am:628fa05e0a-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
2ff1f4a79a