tree 4daa327ad78fafcddaa1ccbf1f22bb66fa04eac3
parent 5fbdf8ab1b50b2e1b3ff77bd7fca64840bc16b7d
parent dc253383bdcfe62bcffd07c1491cdfb830837cf2
author Inseob Kim <inseob@google.com> 1544735676 -0800
committer android-build-merger <android-build-merger@google.com> 1544735676 -0800

Merge "Schematize Contacts system properties" am: 559ec507e5
am: dc253383bd

Change-Id: I3324d23a4e5fe5faa0149c2682bf97fae9bb2fcf