tree 71bcd9df152d4b64a490b9a70c4250c2203ebdd4
parent f150772c994efa5bd80a0def10182c9c2bb2195a
parent 18bc51f7a9694f91fa8030a76ce4345357406b07
author Jeff Tinker <jtinker@google.com> 1442511860 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442511860 +0000

am 18bc51f7: am 75f0b792: am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev

* commit '18bc51f7a9694f91fa8030a76ce4345357406b07':
  DO NOT MERGE Fix vulnerability in mediaserver