OSDN Git Service

am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE"...
authorJeff Tinker <jtinker@google.com>
Thu, 17 Sep 2015 17:28:46 +0000 (17:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 17:28:46 +0000 (17:28 +0000)
commit52b829cbc2cb947733f312211a007ecd2f9fe96b
tree2a8e238b2dbadc4525217e7656c4827bae4d354b
parent190786d3590c6b064a7d32eaa92f4a7b11cf16d5
parentf43125ed08a408b02613b99f058564d97ce690cc
am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev

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