tree ccbeaef9331b96b2a5fa254cfc08a0ac998ac8d9
parent 9bda3fe810bea92852b6fb018e9bfab28918ed13
parent 2215bd7a75ceca10658591f64324a2d4c23aac6f
author Nick Kralevich <nnk@google.com> 1553910385 -0700
committer android-build-merger <android-build-merger@google.com> 1553910385 -0700

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

Change-Id: I4d1be96b9e7285aada712482c366a22451b6dacc