OSDN Git Service

Merge "vold should #include <sys/sysmacros.h>" am: 398c0e8274 am: 208b464f72 am:...
authorElliott Hughes <enh@google.com>
Fri, 19 May 2017 19:01:20 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:01:20 +0000 (19:01 +0000)
am: 048422d46e

Change-Id: I33406265fcf0c77a6289cb429aa6a2cc5e8f7146

1  2 
Utils.cpp
VolumeManager.cpp

diff --cc Utils.cpp
Simple merge
Simple merge