OSDN Git Service

(root) / android-x86 / system-vold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a127c0 ccd9dd5)
resolve merge conflicts of 81fd991 to nyc-dev-plus-aosp
authorMattias Nissler <mnissler@google.com>
Wed, 13 Apr 2016 01:56:49 +0000 (01:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Apr 2016 01:56:49 +0000 (01:56 +0000)
am: ccd9dd5

* commit 'ccd9dd53f8a55b296eb0671acefc9f0163fd83b4':
  Switch to BoringSSL crypto.

Change-Id: Icc997e054801181ab99cbd9a77cd209b93ec9cd3


Trivial merge
system/vold
About OSDN
Find Software
Develop Software
Help