From: Lucas Dupin <dupin@google.com>
Date: Thu, 22 Jun 2017 18:01:12 +0000 (+0000)
Subject: Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am: d0550a9b6c" into... 
X-Git-Tag: android-x86-9.0-r1~1030^2~780
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de1008b580;p=android-x86%2Fframeworks-base.git

Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am: d0550a9b6c" into oc-dr1-dev
am: 99613f8253

Change-Id: I09f5a5351f9c71be3db9d85405a4244cf0e3ee5d
---

de1008b5809527a912e4819641b582332a5930b1