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