| commit | 0b073e9c7ad3f5aa160f41d329325a8c747cf0a2 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Sep 17 17:44:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 17:44:20 2015 +0000 |
| tree | 71bcd9df152d4b64a490b9a70c4250c2203ebdd4 | |
| parent | f150772c994efa5bd80a0def10182c9c2bb2195a [diff] | |
| parent | 18bc51f7a9694f91fa8030a76ce4345357406b07 [diff] |
am 18bc51f7: am 75f0b792: am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev * commit '18bc51f7a9694f91fa8030a76ce4345357406b07': DO NOT MERGE Fix vulnerability in mediaserver