tree 6e4903af5519e1bf90c7ecb1c6482d0f349bf71c
parent 193b167cf1a1c71e96ae40ee4dcec0b94510e6d3
parent 92e9bb6d973031752412b6c5e5ca2c3791120c4c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1544151927 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1544151927 +0000

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