| commit | 53c553bf62975fe7cbf4109842b34b8cb004aff8 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Fri Jun 20 22:30:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 22:30:31 2014 +0000 |
| tree | 64ff96d832ca8e2221bf4c2f8b515bb74e0e1829 | |
| parent | 8d4d469c74782d6ae3f2a70f646a016bf1069d99 [diff] | |
| parent | ad8c8940f1cd8c9aedc5a1b78723d8850195b171 [diff] |
am ad8c8940: am b0849ece: am 6774c012: resolved conflicts for merge of ef6f8102 to klp-dev * commit 'ad8c8940f1cd8c9aedc5a1b78723d8850195b171': Add test for CVE-2014-3153