tree 12fa0015a1654da7a4dfcdb915eea6d9a4d1a592
parent efe40f6ed6714a528e6932918fc445d2e4ded861
parent eb90db918730013e5047229f2b2016f940125e9c
author Kenny Root <kroot@google.com> 1378421040 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378421040 -0700

am eb90db91: Merge "Add libcore.conscrypt tests back to CTS" into klp-dev

* commit 'eb90db918730013e5047229f2b2016f940125e9c':
  Add libcore.conscrypt tests back to CTS