tree e19932487e872a1f46e3a2fc84e7faf9bd1e3ef2
parent 0e79506b1d04e37a460e744ab1d8294dad1f9791
parent 6135f32004c3e1e20bb4d2003c7380b5192f95da
author Jean-Michel Trivi <jmtrivi@google.com> 1444786679 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444786679 +0000

am 6135f320: am acb867f1: am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors

* commit '6135f32004c3e1e20bb4d2003c7380b5192f95da':
  NotificationPlayer supports MediaPlayer errors