| commit | c4f7e92b19375fc53cfe24efb5e4127aca45f895 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:06:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:06:50 2015 +0000 |
| tree | 821bf05b8a80ac3a77783f0ad59db23d105847ef | |
| parent | faced8cd5f11954bf564ee19503bfbdced415a77 [diff] | |
| parent | 69c8327b741844072948831162e94a52a34152f1 [diff] |
am 69c8327b: am 9dcb4c63: am 4ae700d2: am 160ed868: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev * commit '69c8327b741844072948831162e94a52a34152f1': DO NOT MERGE Fix vulnerability in mediaserver