tree 2595fa417fa3df69f939695550222a856c53e058
parent 11bb2bddc5260b343ce81b1a46fad5cb0467632a
parent 39bddb1f9333ff79d3f82f38d7ee67f5fc3667c6
author Brian Carlstrom <bdc@google.com> 1370318431 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370318431 -0700

am 39bddb1f: am ff9f947b: Merge changes I8c8f1572,Idc2bbd24

* commit '39bddb1f9333ff79d3f82f38d7ee67f5fc3667c6':
  Track changes to JSSE
  Allow CipherTest to run on RI