| commit | b566a55ef00b267e4c7391ae6f0c7f170750314b | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 19:06:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 19:06:19 2015 +0000 |
| tree | 3bda253cf775abffaaf5415c71ff2aeb4fa383d2 | |
| parent | 69c8327b741844072948831162e94a52a34152f1 [diff] | |
| parent | da9c517a96923a27829b7dc643bcba27bfae9ddd [diff] |
am da9c517a: am 93e3abfc: am 48904845: am 52b829cb: (-s ours) am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev * commit 'da9c517a96923a27829b7dc643bcba27bfae9ddd': Fix for security vulnerability in media server DO NOT MERGE