tree 5a1836145623a6fd897fa2410540e7972f340785
parent ae683e22fdf3e7af41349be8f180af75b97e5f66
parent 99e63e75b670aeca1b4af401cb9582ba9fddf64d
author Jeff Tinker <jtinker@google.com> 1442510494 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442510494 +0000

am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev

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