tree df31de9822ee32965f1003b1b6dac316d59a1f2f
parent 5b5bbc18d749ed21c82f5697bcd67afa3774964f
parent 38394c7d2d6d5bd8c7467155587a78b912e2b7ab
author Paul Lawrence <paullawrence@google.com> 1423455268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423455268 +0000

am 38394c7d: am 223fd1ca: Revert "Make encryption configurable"

* commit '38394c7d2d6d5bd8c7467155587a78b912e2b7ab':
  Revert "Make encryption configurable"