OSDN Git Service

Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev
authorJeff Tinker <jtinker@google.com>
Thu, 17 Sep 2015 17:04:32 +0000 (17:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Sep 2015 17:04:32 +0000 (17:04 +0000)
commit160ed868d6beb0d55dc2194564d2f08cc9d6fbc2
tree18ba63622c0c5f7bed51dddaf04190e1aeeae7d7
parent99e63e75b670aeca1b4af401cb9582ba9fddf64d
parent5e7e87a383fdb1fece977097a7e3cc51b296f3a0
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev
media/libmedia/ICrypto.cpp