| commit | 81446b8601f2abd6cdf6559b4f21a3cd9ca650d8 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:30:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:18 2015 +0000 |
| tree | 307f10d5342c2fcf823920ca7e0af2a38ee135f8 | |
| parent | cb729b96a5502d38b7b2a9d7c02e9d7158a584ff [diff] | |
| parent | 8a877f092c30aa8b4b4a828ed26bf6b287b991a9 [diff] |
am 8a877f09: (-s ours) 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 '8a877f092c30aa8b4b4a828ed26bf6b287b991a9': Fix for security vulnerability in media server DO NOT MERGE