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:
0b1d93b
43100e5
)
Manually merge commit 'b406ffa' into stage-aosp-master am: 04c55e6ed7 am: 93722ead06
author
Adrien Schildknecht
<adriens@google.com>
Sat, 3 Dec 2016 04:20:13 +0000
(
04:20
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 3 Dec 2016 04:20:13 +0000
(
04:20
+0000)
am:
43100e580f
Change-Id: I8a74fd730f0aa5a1f94c04c12286e96ac299b463
1
2
Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
cryptfs.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Android.mk
Simple merge
diff --cc
cryptfs.c
Simple merge
OSDN Git Service
