| commit | 26d606d9fe51d95aa841a3cef1cf129ab78cc50d | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 22:09:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:09:25 2015 +0000 |
| tree | 9cd2a666e3d0aae09cf5ab6b27b34177aa7ce12e | |
| parent | 34fb33ffd2c07a6b03bfa122651520ab48a46c4c [diff] | |
| parent | 0561d27b41368c38bbb033f0efe7dea64ca4b8de [diff] |
am 0561d27b: (-s ours) 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 '0561d27b41368c38bbb033f0efe7dea64ca4b8de': DO NOT MERGE Fix vulnerability in mediaserver