tree 18ba63622c0c5f7bed51dddaf04190e1aeeae7d7
parent 160ed868d6beb0d55dc2194564d2f08cc9d6fbc2
parent 52b829cbc2cb947733f312211a007ecd2f9fe96b
author Jeff Tinker <jtinker@google.com> 1442511491 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442511491 +0000

am 52b829cb: (-s ours) am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev

* commit '52b829cbc2cb947733f312211a007ecd2f9fe96b':
  Fix for security vulnerability in media server DO NOT MERGE