| commit | 0c84fa7f677d17cb688936235b0d29c8814e90a4 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:06:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:06:52 2015 +0000 |
| tree | 821bf05b8a80ac3a77783f0ad59db23d105847ef | |
| parent | 8a877f092c30aa8b4b4a828ed26bf6b287b991a9 [diff] | |
| parent | 3d6ba305982d600efed21090800a0bf5c3c01337 [diff] |
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 '3d6ba305982d600efed21090800a0bf5c3c01337': DO NOT MERGE Fix vulnerability in mediaserver