| commit | 64b1d6b9c1c54389041a89ef84eac0527424cc95 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Sep 17 20:00:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 20:00:29 2015 +0000 |
| tree | 4658cda96b758569f241beae5e0012accaaf3292 | |
| parent | fc2c73edef7b0a118634f75cf0ab2f3769ab0462 [diff] | |
| parent | 0b073e9c7ad3f5aa160f41d329325a8c747cf0a2 [diff] |
am 0b073e9c: (-s ours) am 18bc51f7: am 75f0b792: am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev * commit '0b073e9c7ad3f5aa160f41d329325a8c747cf0a2': DO NOT MERGE Fix vulnerability in mediaserver