OSDN Git Service

Merge "vold: Add nvme disk support" am: 6054bc3ded
authorDmitry Shmidt <dimitrysh@google.com>
Tue, 15 May 2018 20:35:52 +0000 (13:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 May 2018 20:35:52 +0000 (13:35 -0700)
am: 3a920e3f6e

Change-Id: Ie4946e65924fffae8b810b54658b64e34a543fb4

1  2 
model/Disk.cpp

diff --cc model/Disk.cpp
Simple merge