| commit | ebbf395f3cab94bdf3f9e3d34e72723597765a1c | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:30:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:15 2015 +0000 |
| tree | 307f10d5342c2fcf823920ca7e0af2a38ee135f8 | |
| parent | 1e6e00c9f01f4fe868994ab56832b1f2cfdd2b45 [diff] | |
| parent | faced8cd5f11954bf564ee19503bfbdced415a77 [diff] |
am faced8cd: (-s ours) am 813c5022: am 1ac11129: am d83f2255: am 99e63e75: Merge "Fix for security vulnerability in media server DO NOT MERGE" into lmp-dev * commit 'faced8cd5f11954bf564ee19503bfbdced415a77': Fix for security vulnerability in media server DO NOT MERGE