| commit | cb729b96a5502d38b7b2a9d7c02e9d7158a584ff | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:30:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:17 2015 +0000 |
| tree | 307f10d5342c2fcf823920ca7e0af2a38ee135f8 | |
| parent | ebbf395f3cab94bdf3f9e3d34e72723597765a1c [diff] | |
| parent | c4f7e92b19375fc53cfe24efb5e4127aca45f895 [diff] |
am c4f7e92b: (-s ours) am 69c8327b: am 9dcb4c63: am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev * commit 'c4f7e92b19375fc53cfe24efb5e4127aca45f895': DO NOT MERGE Fix vulnerability in mediaserver