tree bc2cd3131edef4efc21563dae54c04e4553a4a4b
parent 789ce028b514adb10b6bf1420002cc63b1e5a3f1
parent d29f0a6c64bb1cef841da40fcc17848ce1a74192
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580306904 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580306904 +0000

[automerger skipped] Adding option in global setting to control the display message during user switch am: a9feb4602f am: d29f0a6c64 -s ours
am skip reason: Change-Id I70c72d7d74c72a78d919ae34906b6f7b96466ad1 with SHA-1 e12de0beb4 is in history

Change-Id: Ieaefce68c10856e68d970a834ce7abee05c33fee