| commit | faced8cd5f11954bf564ee19503bfbdced415a77 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:06:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:06:49 2015 +0000 |
| tree | 78cb3db36f9a64d71b2aa23620a4ac4fc7714fb4 | |
| parent | 618e6f6182e9c20150f5c803f0c13d282f10a1f5 [diff] | |
| parent | 813c50220fe45665cd5ec91e33e229b02d61674f [diff] |
am 813c5022: am 1ac11129: am d83f2255: am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev * commit '813c50220fe45665cd5ec91e33e229b02d61674f': Fix for security vulnerability in media server DO NOT MERGE