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