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