| commit | 8e0787f3082f1b66e17c035e876683e42eaee896 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Mar 21 18:46:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 21 18:46:49 2014 +0000 |
| tree | 49089f5f4c57f0199d1a5e9b45c820ac0b922322 | |
| parent | e0a0d0a911b2dc641a882860800a9b4bcb2e6848 [diff] | |
| parent | d8c32164e19d16cf7d66b9aee368369ae16a4f0d [diff] |
am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." * commit 'd8c32164e19d16cf7d66b9aee368369ae16a4f0d': Adjust to the change in the private SSLParameterImpl API.