| commit | 0561d27b41368c38bbb033f0efe7dea64ca4b8de | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 22:02:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:02:22 2015 +0000 |
| tree | b008aa4140cfff3e7da8c0dfe2d2138a40ca19aa | |
| parent | 88f826345cd0a642268586293c658522162b8df2 [diff] | |
| parent | 66fd358ab0cc4c6f2de154643e15193ba5ffa690 [diff] |
am 66fd358a: 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 '66fd358ab0cc4c6f2de154643e15193ba5ffa690': DO NOT MERGE Fix vulnerability in mediaserver