tree af0bd42d291b48a64ba5f2603fa20e2e53440fd4
parent c604a9297ae6bb68950f21583053211287a4df10
parent 6d000617230e82b9497a88ca0f485e0c16ba4543
author James Dong <jdong@google.com> 1346087930 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346087930 -0700

am 6d000617: am db7e3856: Merge "Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method" into jb-mr1-dev

* commit '6d000617230e82b9497a88ca0f485e0c16ba4543':
  Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method