tree 586467b5d780f1844b1936b4ba98bf84b0b6cf40
parent 10ac55ba4f0beed608b310c473bb052cbcdf19c1
parent b0cb07348e6320ce51d0e8b88d240ecf834850d1
author Kenny Root <kroot@google.com> 1415040055 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415040055 +0000

am b0cb0734: Merge "Track change to Conscrypt"

* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt