tree ef4c1604363c2354f937b5bf2cc6c325c502f94a
parent b47890c4e7a7fc119e74da2b50bf94c2cf172916
parent 16fa58cb133f539016a5e013897c7de7f58ff16d
author Jean-Michel Trivi <jmtrivi@google.com> 1439577188 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439577188 +0000

am 16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev

* commit '16fa58cb133f539016a5e013897c7de7f58ff16d':
  Fix to check the incoming userid argument for RingtonePlayer