tree 1d6565c297fb9fc3d0ab7133a9c57110288c3247
parent ca727d2f03b2b3ba19b7d43f20305aab3825eb1d
parent d0f39dbb37a6c6d32b481067517daae95b360555
author Alex Klyubin <klyubin@google.com> 1420491640 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420491640 +0000

am d0f39dbb: Merge "Fix Harmony\'s HostnameVerifierTest breakage."

* commit 'd0f39dbb37a6c6d32b481067517daae95b360555':
  Fix Harmony's HostnameVerifierTest breakage.