| commit | 17e4eca8363c4ed95b3d413108228de80d08614c | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:37:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:37:21 2015 +0000 |
| tree | 088cb49e729fe0cfccf78c10d5398f89c68a435c | |
| parent | bcd02111f5616895a2b294c4a4cc1c8193a7e1cc [diff] | |
| parent | ebbf395f3cab94bdf3f9e3d34e72723597765a1c [diff] |
am ebbf395f: 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 'ebbf395f3cab94bdf3f9e3d34e72723597765a1c': Fix for security vulnerability in media server DO NOT MERGE