Merge "Removing a mimeIcon specific for album folders from MediaProvider."...
Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev am: c8358bfe am: 642941d6
am: 27c9ff26
Change-Id: I9610df5d292d10f5777458a5cfc51a8d49297375