OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fcc1463
ad48884
)
Merge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f
author
Tom Cherry
<tomcherry@google.com>
Fri, 31 Mar 2017 16:47:41 +0000
(16:47 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 31 Mar 2017 16:47:41 +0000
(16:47 +0000)
am:
ad48884579
Change-Id: I4326d686edb8b0e7bbd27f260597a5c6b8f131c3
1
2
ext4_utils/ext4_crypt_init_extensions.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ext4_utils/ext4_crypt_init_extensions.cpp
Simple merge