tree 7c645da883c17c20e4afc129a2f77c1b662999ad
parent cdabfe48c300f15466c9472375d7ad2ccf9ba328
parent 2c2345cf7e163f532f32597051f579cdb0e36bec
author Andreas Huber <andih@google.com> 1366825512 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366825512 -0700

am 2c2345cf: am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"

* commit '2c2345cf7e163f532f32597051f579cdb0e36bec':
  fix a race condition of MediaPlayerServce::Client::mClient