| commit | 4ae700d2bd467f18e5de8b5d1579d7e20da88e36 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Sep 17 17:21:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 17:21:35 2015 +0000 |
| tree | a35a0e18f78b5d4740e6f8eeae5a9f4151b9c93a | |
| parent | d83f22552372edfe67473c29a370e0a025a91f21 [diff] | |
| parent | 160ed868d6beb0d55dc2194564d2f08cc9d6fbc2 [diff] |
am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev * commit '160ed868d6beb0d55dc2194564d2f08cc9d6fbc2': DO NOT MERGE Fix vulnerability in mediaserver