| commit | b0849ece4778bae6bf1f489680125d1f9237024c | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Fri Jun 20 16:36:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 16:36:43 2014 +0000 |
| tree | 4567084babf248e5abf50ee907e8d054b7694e59 | |
| parent | 59aca1ae3126944b13e88b00a41e5c9011a20631 [diff] | |
| parent | 6774c0122b64d6cc0520db6f60532ea026043a47 [diff] |
am 6774c012: resolved conflicts for merge of ef6f8102 to klp-dev * commit '6774c0122b64d6cc0520db6f60532ea026043a47': Add test for CVE-2014-3153