tree 4ccad1a1d3086dc1b05b4f17f309dabb12383252
parent dab702ecb71c7e0357e8662dddf4c8b71f1d5327
parent 194254a174967c85f9436cebe786d1e62d874234
author Ian Lake <ilake@google.com> 1429723049 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429723049 +0000

am 194254a1: Merge "MediaSessionCompat set BITMAP_KEY_ARTWORK metadata in API 14 instead of API 19" into lmp-mr1-supportlib-release

* commit '194254a174967c85f9436cebe786d1e62d874234':
  MediaSessionCompat set BITMAP_KEY_ARTWORK metadata in API 14 instead of API 19