| commit | 48904845e16b9b18b75e6c75726f94ab49c7a1f8 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Sep 17 17:38:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 17:38:11 2015 +0000 |
| tree | 18ba63622c0c5f7bed51dddaf04190e1aeeae7d7 | |
| parent | 160ed868d6beb0d55dc2194564d2f08cc9d6fbc2 [diff] | |
| parent | 52b829cbc2cb947733f312211a007ecd2f9fe96b [diff] |
am 52b829cb: (-s ours) am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev * commit '52b829cbc2cb947733f312211a007ecd2f9fe96b': Fix for security vulnerability in media server DO NOT MERGE