Apollo: Add menu action to delete current track.

Change-Id: I8fad766ebba53bf37d8f965761e9da4ca4fafb87
Merge "Apollo: Add menu action to delete current track." into cm-10.1
merge CyanogenMod

Change-Id: I878960149453d34db2d7361db687f853b5ac1b6c
Apollo: SK translation

Change-Id: Iae5491c8fb2388af82af79286fa391d19b391cb0
Merge branch 'cm-10.1' into martincz
Apollo: Make albums with the same name to use respective album-art/date/etc.

It may happen that two (or more) albums have the same name but each of them
comes from different artist. This case was not handled correctly causing with
the same album art to be used for all albums.

This patch makes sure that the proper album data is fetched for album. It's
achieved by either adding album artist (i.e., for cached images) or using
album id (unique) where possible (not causing too much code churn).

Change-Id: I181a28d80a18207101c613cca390f18d88dd556a
Merge "Apollo: Make albums with the same name to use respective album-art/date/etc." into cm-10.1
Merge branch 'cm-10.1' into martincz
Merge remote-tracking branch 'mokee/jb-mr1_mkt' into aokp-mr1.1