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