diff options
author | Kenny Root <kroot@android.com> | 2013-01-25 17:11:57 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-25 17:11:57 -0800 |
commit | e7e0a072704a5dec3d709fce60762e515382ee42 (patch) | |
tree | 48e09eacf5beea6975d815712037a32ad65bac0e /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | b9781fe08c5b1afba086857aa18b46862550ae88 (diff) | |
parent | 4dca3946177aaea54d78d39273324caacf74a7bb (diff) |
am 4dca3946: am df1498dc: am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Android Git Automerger (2) and others
* commit '4dca3946177aaea54d78d39273324caacf74a7bb':
Add TLS Channel ID support to SSLCertificateSocketFactory.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions