From: Xin Li <delphij@google.com>
Date: Wed, 20 Feb 2019 18:16:18 +0000 (-0800)
Subject: [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 9d8c2cc2c6... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec45103b4dcc7ffe25ee7264c87a154d584f6605;hp=-c;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 9d8c2cc2c6 -s ours am: a99376f647 -s ours
am: 3003b4b39c -s ours
am skip reason: subject contains skip directive

Change-Id: I3d5eeea407f925dbc342ff8c059555c76c05fa86
---

ec45103b4dcc7ffe25ee7264c87a154d584f6605