Merge "[automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am: 9dfd13e7ea -s ours am: 81b6da69b6 -s ours am: fead48f400 -s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
d8ea250a63