OSDN Git Service

Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev
authorJeff Tinker <jtinker@google.com>
Thu, 17 Sep 2015 17:04:15 +0000 (17:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Sep 2015 17:04:15 +0000 (17:04 +0000)
commit99e63e75b670aeca1b4af401cb9582ba9fddf64d
tree51f94e7d51f24250da47e55716f0e626bc769dd8
parent13a8c5dd7f7437da67ecf8e2886e486191e95ff2
parent4b219e9e5ab237eec9931497cf10db4d78982d84
Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev