tree a2b682914fee9619b06ee52c68be25d1eaa7a1d3
parent bda6272446454886339841a62daaa1b66c07ad60
author Paul Lawrence <paullawrence@google.com> 1423243099 +0000
committer Paul Lawrence <paullawrence@google.com> 1423243929 +0000

Revert "Make encryption configurable"

This reverts commit bda6272446454886339841a62daaa1b66c07ad60.

The original fix seems to have led to boot failures in QA. Rather than
risk shipping, revert the change. Bug 18764230 reopened.

Requires change
    https://googleplex-android-review.git.corp.google.com/#/c/629764/

Bug: 19278390
Bug: 19199624

Change-Id: I8b6ab585666f2b0f585ffb2a5f61ac2e3462e06e