tree 6f254c209e473f81bbf2d70d71e6a2c665cc5c83
parent 5ee8b780725e04ee82bd6384607d5d545f0780bf
parent dd0fc053d27e4c2169e65751d81529d49445bef6
author Andreas Gampe <agampe@google.com> 1474735744 +0000
committer android-build-merger <android-build-merger@google.com> 1474735744 +0000

Merge "Vold: remove unused define" am: 7ac97f8e37 am: de114c0d89
am: dd0fc053d2

Change-Id: I2d223f85f22929ed531d6fabb86cfbe2727aa71b