| commit | ad8c8940f1cd8c9aedc5a1b78723d8850195b171 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Fri Jun 20 16:40:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 16:40:54 2014 +0000 |
| tree | 84dd66fce229b2118fa5bd8b128c65f34da6d639 | |
| parent | d7aeba9ceab3250c8fec7e3fcf4198e63ec0e128 [diff] | |
| parent | b0849ece4778bae6bf1f489680125d1f9237024c [diff] |
am b0849ece: am 6774c012: resolved conflicts for merge of ef6f8102 to klp-dev * commit 'b0849ece4778bae6bf1f489680125d1f9237024c': Add test for CVE-2014-3153