From: Daniel Nishi <dhnishi@google.com>
Date: Fri, 9 Jun 2017 00:30:31 +0000 (+0000)
Subject: Merge "Merge "Update the music files icon." into oc-dev am: 47c6afde7f am: 60287a50e8... 
X-Git-Tag: android-x86-9.0-r1~833
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=caacba845c1e60ac73ef0c10aa869fddfcf8506e;p=android-x86%2Fpackages-apps-Settings.git

Merge "Merge "Update the music files icon." into oc-dev am: 47c6afde7f am: 60287a50e8" into oc-dr1-dev-plus-aosp
am: feaa8fe083

Change-Id: Ifdf5877774b4022a118fa9231aaee1fe6f4a3579
---

caacba845c1e60ac73ef0c10aa869fddfcf8506e