From: Raff Tsai Date: Wed, 5 Jun 2019 09:13:22 +0000 (-0700) Subject: [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=14302b3ac6;p=android-x86%2Fpackages-apps-Settings.git [automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407 --- 14302b3ac6ed9de1270c228f36cec9f2605f8eeb