| commit | 494137873dc0ccc865a49ca2d0a842f9c6771f3c | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:44:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:44:57 2015 +0000 |
| tree | 088cb49e729fe0cfccf78c10d5398f89c68a435c | |
| parent | f50fb475ca3006d87fda9222f95a0e7b5ea53991 [diff] | |
| parent | 074e08fc2caab5b44e59c1686353ba7cabc41815 [diff] |
am 074e08fc: am cb729b96: am c4f7e92b: (-s ours) am 69c8327b: am 9dcb4c63: am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev * commit '074e08fc2caab5b44e59c1686353ba7cabc41815': DO NOT MERGE Fix vulnerability in mediaserver