OSDN Git Service

[automerger skipped] Merge "Schematize vold system properties" am: 8cf17f7234 am...
authorInseob Kim <inseob@google.com>
Fri, 7 Dec 2018 03:04:50 +0000 (19:04 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Dec 2018 03:04:50 +0000 (19:04 -0800)
am: cd614a097e  -s ours

Change-Id: I2ba852d7747964f530d9616c0eabcd25f211ae0b


Trivial merge