[automerger skipped] Merge "Schematize ADB system properties" into stage-aosp-master am: dcc7fb2198 -s ours
am:3e011f6aab-s ours am skip reason: change_id I654c0e1f234d097a66f79ba8c019b8bebc794816 with SHA1d8849f0351is in history Change-Id: I264f6d757d5199b5ea9376ba0d64f8e0d7f8af31
This commit is contained in: