OSDN Git Service

(root) / android-x86 / system-vold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce63cbc 85dfdb0)
Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f am: e72c338
authorPaul Lawrence <paullawrence@google.com>
Tue, 19 Apr 2016 14:53:04 +0000 (14:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 14:53:04 +0000 (14:53 +0000)
am: 85dfdb0

* commit '85dfdb082d87e2e17e69cc74d5b773959b15645c':
  Don't start defaultcrypto twice

Change-Id: Ia3c7998a00bc96dfbb211bfdf733eb22708ad13a

1  2 
cryptfs.c patch | diff1 | diff2 | blob | history

diff --cc cryptfs.c
Simple merge
system/vold
About OSDN
Find Software
Develop Software
Help