tree 088cb49e729fe0cfccf78c10d5398f89c68a435c
parent bcd02111f5616895a2b294c4a4cc1c8193a7e1cc
parent ebbf395f3cab94bdf3f9e3d34e72723597765a1c
author Jeff Tinker <jtinker@google.com> 1442871441 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442871441 +0000

am ebbf395f: am faced8cd: (-s ours) am 813c5022: am 1ac11129: am d83f2255: am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev

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