tree 1e53d1d98dab2731bb0c7d500c3eef1b34119e31
parent 9d7bf437b059001674f3f7fc8911a2f10680750b
parent de114c0d895fccbfd550a249ab9994efd9cf666d
author Andreas Gampe <agampe@google.com> 1474735602 +0000
committer android-build-merger <android-build-merger@google.com> 1474735602 +0000

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

Change-Id: Ida80b4ef12a7fcccadd219c7a7a4151a6f1b6098