tree 84103dc507b095d549eda197041848f91210055d
parent a04e2247eef84173f3be5ab93313c1ba75a4148b
parent d23d26da08fa30c9b6159424ccd64dc6f778d586
author Kenny Root <kroot@google.com> 1367337700 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367337700 -0700

am d23d26da: am 25ffb0d7: Merge "Track change to JSSE provider"

* commit 'd23d26da08fa30c9b6159424ccd64dc6f778d586':
  Track change to JSSE provider