tree 336dbd65770fc73b12e8a3716f5582e39872aef8
parent 6efb1c66d0527a4404636ba148480a0635fd282f
parent aee74ef40d1521f5301d803e9c275285d9d719ee
author Tony Mantler <nicoya@google.com> 1414954428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414954428 +0000

am aee74ef4: am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!)

* commit 'aee74ef40d1521f5301d803e9c275285d9d719ee':
  Default to encrypted connections (YAY!)