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

am: 95a1128814  -s ours

Change-Id: Id55802e6e5395a0f748f5b125d551b64c22473f1
This commit is contained in:
Inseob Kim
2018-12-11 03:34:42 -08:00
committed by android-build-merger

Diff Content Not Available