Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev am: c8358bfe65
am: 642941d629
Change-Id: I48357c812334f6150ce903af470f865f99311fbd
This commit is contained in: