| commit | 2c46c8fdfc226df5ea95b521c0c554cb6ee37ae7 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Sep 12 11:55:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 12 11:55:41 2013 -0700 |
| tree | 318cf5d941e83ba2aab1abb0a46ad937b1aae836 | |
| parent | 5f380611d29cb4bdd78ac1c0a2f63912de452567 [diff] | |
| parent | d6ccc764d4723e48d1669ad50faad93d46334a18 [diff] |
am d6ccc764: Merge "Add libcore.conscrypt tests back to CTS" * commit 'd6ccc764d4723e48d1669ad50faad93d46334a18': Add libcore.conscrypt tests back to CTS