OSDN Git Service

am 223fd1ca: Revert "Make encryption configurable"
authorPaul Lawrence <paullawrence@google.com>
Sat, 7 Feb 2015 00:11:29 +0000 (00:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 7 Feb 2015 00:11:29 +0000 (00:11 +0000)
* commit '223fd1cad8d627dc36e11da8cdd342c1a810d226':
  Revert "Make encryption configurable"

1  2 
CommandListener.cpp
cryptfs.c
cryptfs.h

Simple merge
diff --cc cryptfs.c
Simple merge
diff --cc cryptfs.h
Simple merge