summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2015-09-21 19:06:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-21 19:06:20 +0000
commit3d6ba305982d600efed21090800a0bf5c3c01337 (patch)
tree3bda253cf775abffaaf5415c71ff2aeb4fa383d2
parentb566a55ef00b267e4c7391ae6f0c7f170750314b (diff)
parentce388779cbdb5059c49a72c16b60487e68f8f418 (diff)
downloadframeworks_av-3d6ba305982d600efed21090800a0bf5c3c01337.zip
frameworks_av-3d6ba305982d600efed21090800a0bf5c3c01337.tar.gz
frameworks_av-3d6ba305982d600efed21090800a0bf5c3c01337.tar.bz2
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
0 files changed, 0 insertions, 0 deletions