Skip to content
Commit fdb48f4e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit... 

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

am skip reason: Merged-In I20551a2dba9aa79efa0c064824f349f551c2c2e4 with SHA-1 a8f756f9 is already in history

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



Change-Id: I40e00619c3d1e6c80f2eeaff715bfead30f48a75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e78fc66 01effff4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment