commit | fb5104ec0cc11a50d1a56224cd1ca2950c2def45 | [log] [tgz] |
---|---|---|
author | Jeff Tinker <jtinker@google.com> | Thu Sep 17 17:38:12 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 17:38:12 2015 +0000 |
tree | 18ba63622c0c5f7bed51dddaf04190e1aeeae7d7 | |
parent | 48904845e16b9b18b75e6c75726f94ab49c7a1f8 [diff] | |
parent | 4554ffd7a1c4bc6973c11c00f5a19aa260e18100 [diff] |
am 4554ffd7: (-s ours) am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev * commit '4554ffd7a1c4bc6973c11c00f5a19aa260e18100': DO NOT MERGE Fix vulnerability in mediaserver