From: Xin Li <delphij@google.com>
Date: Wed, 20 Feb 2019 18:36:50 +0000 (-0800)
Subject: [automerger skipped] Merge changes from topic "PPRL.190205.001" am: 4ba3b12efb -s... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5755d6ad3913be0a9dcd39927dca481e094fc2c9;p=android-x86%2Fframeworks-base.git

[automerger skipped] Merge changes from topic "PPRL.190205.001" am: 4ba3b12efb -s ours
am: 1e8a0c8d89 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 95bd7221f6 is in history

Change-Id: If0a545f1a09f0a4471f2c6adadfe79ad434bebd4
---

5755d6ad3913be0a9dcd39927dca481e094fc2c9