| commit | 694ec7bccf94bbaf6faf752faf57488b88c69014 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Mon Sep 21 21:30:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:20 2015 +0000 |
| tree | 307f10d5342c2fcf823920ca7e0af2a38ee135f8 | |
| parent | 81446b8601f2abd6cdf6559b4f21a3cd9ca650d8 [diff] | |
| parent | 0c84fa7f677d17cb688936235b0d29c8814e90a4 [diff] |
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 '0c84fa7f677d17cb688936235b0d29c8814e90a4': DO NOT MERGE Fix vulnerability in mediaserver