| commit | 3f7f8284fef56212d8327039fd55f910677cd50a | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:37:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:37:24 2015 +0000 |
| tree | 088cb49e729fe0cfccf78c10d5398f89c68a435c | |
| parent | 074e08fc2caab5b44e59c1686353ba7cabc41815 [diff] | |
| parent | 81446b8601f2abd6cdf6559b4f21a3cd9ca650d8 [diff] |
am 81446b86: 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 '81446b8601f2abd6cdf6559b4f21a3cd9ca650d8': Fix for security vulnerability in media server DO NOT MERGE