tree 7493f84d111ca028433fb49ae1d4d8edd4b57cd8
parent 3b85a1784036d5329c6e81a7a80ef293e33a492a
parent 14b406fd8f0bcfa02303e09972d62933aa2d71b5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576261067 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576261067 +0000

[automerger skipped] Merge "[Setting] Cleanup Unused SimSettings" am: 64b5882f9e am: a9692bdf36 am: 14b406fd8f -s ours
am skip reason: Change-Id I3f50e528eb409215371a125184502d3531bad0a8 with SHA-1 5cc9aad7a8 is in history

Change-Id: I259af559edd475f32b5c6c7b31538f289a9853b9