From: Xin Li <delphij@google.com>
Date: Thu, 15 Aug 2019 07:40:41 +0000 (-0700)
Subject: [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e66eb255ee711b77e8f9b2e18f3ed78ef108c17c;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours
am: b03fdd4dcf -s ours
am skip reason: subject contains skip directive

Change-Id: I8b48996bdb25fda1adb55fcb63a3956dddbb8710
---

e66eb255ee711b77e8f9b2e18f3ed78ef108c17c