tree 15c716e707fcbd71cc44247189336f28653b1d01
parent 68bc28decce8f49fabe73b1008213407105deb6f
parent eb39b600296f1ad611a978694957585eff73091c
author Brian Carlstrom <bdc@google.com> 1346301694 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346301694 -0700

am eb39b600: am fef450d3: Merge "Disable SSL compression"

* commit 'eb39b600296f1ad611a978694957585eff73091c':
  Disable SSL compression