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:
b812978
9db4290
)
Merge "Stop using trigger_reset_main." into qt-dev
author
Martijn Coenen
<maco@google.com>
Wed, 1 May 2019 19:42:48 +0000
(12:42 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 1 May 2019 19:42:48 +0000
(12:42 -0700)
am:
9db42907b5
Change-Id: Ife6711c5e0ad5180ce805c8e1df02487c2a957be
1
2
cryptfs.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cryptfs.cpp
Simple merge