tree 24d52223f2e18390f722ba5cc2be737981fb7454
parent 682fd6aedea87e345f033b489ef9f6008bd19c30
parent bbe1682b1652c37b66609676e5829517279ff141
author Daniel Sandler <dsandler@android.com> 1438226117 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438226117 +0000

am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev

* commit 'bbe1682b1652c37b66609676e5829517279ff141':
  Fully support Icons in Notification actions.
  Fix media notification action icons.