| commit | 93e3abfc2aaa9f17a347957e9b2042dc6b8c857b | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Sep 17 17:44:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 17:44:51 2015 +0000 |
| tree | a35a0e18f78b5d4740e6f8eeae5a9f4151b9c93a | |
| parent | 4ae700d2bd467f18e5de8b5d1579d7e20da88e36 [diff] | |
| parent | 48904845e16b9b18b75e6c75726f94ab49c7a1f8 [diff] |
am 48904845: am 52b829cb: (-s ours) am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev * commit '48904845e16b9b18b75e6c75726f94ab49c7a1f8': Fix for security vulnerability in media server DO NOT MERGE