| commit | 3d6ba305982d600efed21090800a0bf5c3c01337 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 19:06:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 19:06:20 2015 +0000 |
| tree | 3bda253cf775abffaaf5415c71ff2aeb4fa383d2 | |
| parent | b566a55ef00b267e4c7391ae6f0c7f170750314b [diff] | |
| parent | ce388779cbdb5059c49a72c16b60487e68f8f418 [diff] |
am ce388779: am d3601b1d: am fb5104ec: am 4554ffd7: (-s ours) am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev * commit 'ce388779cbdb5059c49a72c16b60487e68f8f418': DO NOT MERGE Fix vulnerability in mediaserver