| commit | 4554ffd7a1c4bc6973c11c00f5a19aa260e18100 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Thu Sep 17 17:28:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 17:28:47 2015 +0000 |
| tree | f060c7688a407b2d2ba92ac03ffc56b0758f8ca5 | |
| parent | 52b829cbc2cb947733f312211a007ecd2f9fe96b [diff] | |
| parent | 6272fa1baf361a6a89607243638cc592047947b3 [diff] |
am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev * commit '6272fa1baf361a6a89607243638cc592047947b3': DO NOT MERGE Fix vulnerability in mediaserver