OSDN Git Service

Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev
authorJeff Tinker <jtinker@google.com>
Thu, 17 Sep 2015 17:04:05 +0000 (17:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Sep 2015 17:04:05 +0000 (17:04 +0000)
commitf43125ed08a408b02613b99f058564d97ce690cc
treebffa33718f670773303388e5e69461b1a2ff1d09
parentae92251730865e0c4bc59ef2a8fe9dacb6de41b9
parent9adc7283c84cea1be81d5bd55ce50aefa6328c6e
Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev