| commit | da9c517a96923a27829b7dc643bcba27bfae9ddd | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 18:58:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 18:58:05 2015 +0000 |
| tree | 3bda253cf775abffaaf5415c71ff2aeb4fa383d2 | |
| parent | 9dcb4c63c6b8876a28eab3774ac92cc5e3af13c7 [diff] | |
| parent | 93e3abfc2aaa9f17a347957e9b2042dc6b8c857b [diff] |
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 '93e3abfc2aaa9f17a347957e9b2042dc6b8c857b': Fix for security vulnerability in media server DO NOT MERGE