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