tree cfabe838464926555c132422d6c9e9a141f6fca0
parent 04f55a339112cd949e5bfa3a096ec34a9e74d5f4
parent 1a7cad6b1afa9cf878406fbc90c74e53bd1474cf
author Inseob Kim <inseob@google.com> 1544151824 -0800
committer android-build-merger <android-build-merger@google.com> 1544151824 -0800

[automerger skipped] Merge "Schematize vold system properties" am: 095d0f640e am: 73694f8faa
am: 1a7cad6b1a  -s ours

Change-Id: Ib34c93da4ed36fec25bf5c97fee022db6068d7a1