| commit | 66fd358ab0cc4c6f2de154643e15193ba5ffa690 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:44:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:44:59 2015 +0000 |
| tree | 088cb49e729fe0cfccf78c10d5398f89c68a435c | |
| parent | 2f4851d6b195ec890aeede730f9145384a12ce72 [diff] | |
| parent | a3add504250354d2e43545c673ec959b5b879cee [diff] |
am a3add504: 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 'a3add504250354d2e43545c673ec959b5b879cee': DO NOT MERGE Fix vulnerability in mediaserver