OSDN Git Service
(root)
/
android-x86
/
system-vold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf69455
223fd1c
)
am 223fd1ca: Revert "Make encryption configurable"
author
Paul Lawrence
<paullawrence@google.com>
Sat, 7 Feb 2015 00:11:29 +0000
(
00:11
+0000)
committer
Android 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
patch
|
diff1
|
diff2
|
blob
|
history
cryptfs.c
patch
|
diff1
|
diff2
|
blob
|
history
cryptfs.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CommandListener.cpp
Simple merge
diff --cc
cryptfs.c
Simple merge
diff --cc
cryptfs.h
Simple merge