| commit | a3add504250354d2e43545c673ec959b5b879cee | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:37:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:37:25 2015 +0000 |
| tree | 088cb49e729fe0cfccf78c10d5398f89c68a435c | |
| parent | 3f7f8284fef56212d8327039fd55f910677cd50a [diff] | |
| parent | 694ec7bccf94bbaf6faf752faf57488b88c69014 [diff] |
am 694ec7bc: am 0c84fa7f: (-s ours) am 3d6ba305: am ce388779: am d3601b1d: am fb5104ec: am 4554ffd7: (-s ours) am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev * commit '694ec7bccf94bbaf6faf752faf57488b88c69014': DO NOT MERGE Fix vulnerability in mediaserver