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)

Trivial merge