From: Xin Li <delphij@google.com>
Date: Thu, 11 Jul 2019 02:02:51 +0000 (-0700)
Subject: [automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3bf8c80dd5;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master" am: 0c7e805902 -s ours
am: ba73db3e92 -s ours
am skip reason: subject contains skip directive

Change-Id: I8c1e220708b6ac50415a0c4f7b68784ab6fdf167
---

3bf8c80dd5511ba10d09e8d0660289cc06ffd0a1