tree 9713425692ef2171da0fc78240a091c64eca90a5
parent 0c521d7ce7cbdfcd4481089887217271f231f61b
parent 480990699cd571e475788bfba8ef86bd0bfb96ad
author Jeff Tinker <jtinker@google.com> 1440811692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440811692 +0000

am 48099069: am 3b863069: am 389e7653: Merge "Fix for security vulnerability in media server" into mnc-dev

* commit '480990699cd571e475788bfba8ef86bd0bfb96ad':
  Fix for security vulnerability in media server