Merge changes from topic "am-9dd9c9d7fba44b49afffe53e9f0a56a2"
* changes: [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:e022b1db24-s ours am:284ea65148-s ours [automerger skipped] [RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated am:3c2723ffaf-s ours am:23cceaa391-s ours am:6c38efc26f-s ours am:2e685151b1-s ours am:cd94996ada-s ours am:a087c92ed8-s ours am:a7d145a7ae-s ours am:e88e45fe03-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
9e57ad22f5