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