tree 34e5da554ba5d2c5975d56b664aca3a94f300328
parent 79e8d39de46d1b65be86487c40036c8c32823f43
parent 88b52d2aecdbc7242385ba1f8a2c4d6960ee07fc
author Nicolas Geoffray <ngeoffray@google.com> 1441125370 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441125370 +0000

am 88b52d2a: Merge "More cyrpto failures..."

* commit '88b52d2aecdbc7242385ba1f8a2c4d6960ee07fc':
  More cyrpto failures...