tree b2eb69d4259d59b0b6271a35a28e9466845cc4ac
parent 2cd0b938cba24531f94b4440ffbff587160ea902
parent 048422d46ed27f1544450ab243e97af0c4e84755
author Elliott Hughes <enh@google.com> 1495220480 +0000
committer android-build-merger <android-build-merger@google.com> 1495220480 +0000

Merge "vold should #include <sys/sysmacros.h>" am: 398c0e8274 am: 208b464f72 am: fb3e85cf99
am: 048422d46e

Change-Id: I33406265fcf0c77a6289cb429aa6a2cc5e8f7146