OSDN Git Service

Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev
authorJeff Tinker <jtinker@google.com>
Thu, 17 Sep 2015 17:04:25 +0000 (17:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Sep 2015 17:04:25 +0000 (17:04 +0000)
commit6272fa1baf361a6a89607243638cc592047947b3
treee3f95e231ec43d93a06ff6bdd09f322bf5b305d4
parentf43125ed08a408b02613b99f058564d97ce690cc
parent636539eb1a0d407d7f82b7c9a6d9833f7715e287
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev
media/libmedia/ICrypto.cpp