OSDN Git Service

Merge "vold: write bootloader message directly." into nyc-dev am: cbedcc3
authorYabin Cui <yabinc@google.com>
Sat, 9 Apr 2016 23:12:41 +0000 (23:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 9 Apr 2016 23:12:41 +0000 (23:12 +0000)
am: 008c7dd

* commit '008c7ddb1fe7743f780801c1cf219a3c25445401':
  vold: write bootloader message directly.

Change-Id: I10a098025619c4f32db3ce551a4b85e14a9558a8

1  2 
cryptfs.c

diff --cc cryptfs.c
Simple merge