| commit | 8a877f092c30aa8b4b4a828ed26bf6b287b991a9 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:06:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:06:51 2015 +0000 |
| tree | 821bf05b8a80ac3a77783f0ad59db23d105847ef | |
| parent | c4f7e92b19375fc53cfe24efb5e4127aca45f895 [diff] | |
| parent | b566a55ef00b267e4c7391ae6f0c7f170750314b [diff] |
am b566a55e: 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 'b566a55ef00b267e4c7391ae6f0c7f170750314b': Fix for security vulnerability in media server DO NOT MERGE