| commit | 074e08fc2caab5b44e59c1686353ba7cabc41815 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:37:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:37:22 2015 +0000 |
| tree | 088cb49e729fe0cfccf78c10d5398f89c68a435c | |
| parent | 17e4eca8363c4ed95b3d413108228de80d08614c [diff] | |
| parent | cb729b96a5502d38b7b2a9d7c02e9d7158a584ff [diff] |
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 'cb729b96a5502d38b7b2a9d7c02e9d7158a584ff': DO NOT MERGE Fix vulnerability in mediaserver