tree 25df60112eef41283ca69f72d42fe6878c495256
parent 934af0229b25901e61a030f17bf220722ccfb427
parent cccd07babf0b6cc2ac6979edbf780e32a02addd6
author Marco Nelissen <marcone@google.com> 1352394154 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352394154 -0800

am cccd07ba: am 8f7e3e0f: Merge "AlbumArt image of songs in the non-primary storage root dir are images in the same dir"

* commit 'cccd07babf0b6cc2ac6979edbf780e32a02addd6':
  AlbumArt image of songs in the non-primary storage root dir are images in the same dir