tree 37af16dd3d449e176f59f783add71fde14a04ccf
parent 5ac2c048fb4d18dd1f7a41a36080233c8b87ffe4
parent fe9f5c42f6833b3f1e30a06c3202ce2628c7d2fd
author Inseob Kim <inseob@google.com> 1544528730 -0800
committer android-build-merger <android-build-merger@google.com> 1544528730 -0800

[automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am: cc24a22da9  -s ours am: 95a1128814  -s ours
am: fe9f5c42f6  -s ours

Change-Id: I5f75b15ab792329cdb9bf2dd2e4b42bccb6eb0f3