tree 8ca697f5ef4b9843b9622a962387c4a42d738af3
parent 4197c098dfb467a3d74b02d60ef6fec40c8de05d
parent 874b841223d0613428b9192bd8df848cb3c495fa
author Nick Kralevich <nnk@google.com> 1553910140 -0700
committer android-build-merger <android-build-merger@google.com> 1553910140 -0700

Merge "vold: add android-* to tidy_checks" am: 1820b9b3b9
am: 874b841223

Change-Id: Ica87cf75eadfff9a12c08204240e2d31b10f51a1