OSDN Git Service

am b0cb0734: Merge "Track change to Conscrypt"
authorKenny Root <kroot@google.com>
Mon, 3 Nov 2014 18:40:55 +0000 (18:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Nov 2014 18:40:55 +0000 (18:40 +0000)
commitd00ced983ee235f72a9261fd967309a2638dde05
tree586467b5d780f1844b1936b4ba98bf84b0b6cf40
parent10ac55ba4f0beed608b310c473bb052cbcdf19c1
parentb0cb07348e6320ce51d0e8b88d240ecf834850d1
am b0cb0734: Merge "Track change to Conscrypt"

* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
core/java/android/net/http/HttpsConnection.java