| commit | 52b829cbc2cb947733f312211a007ecd2f9fe96b | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Sep 17 17:28:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 17:28:46 2015 +0000 |
| tree | 2a8e238b2dbadc4525217e7656c4827bae4d354b | |
| parent | 190786d3590c6b064a7d32eaa92f4a7b11cf16d5 [diff] | |
| parent | f43125ed08a408b02613b99f058564d97ce690cc [diff] |
am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev * commit 'f43125ed08a408b02613b99f058564d97ce690cc': Fix for security vulnerability in media server DO NOT MERGE