[automerger skipped] Merge "Temporarily whitelisting system domains writing vendor props" am: 3125af3c16 am: 11d2300472 -s ours

am: 9af73c6484  -s ours

Change-Id: Id8ab4830d05574c0371d285a7ee9d2af87d1afef
This commit is contained in:
Jiyong Park
2018-06-06 00:56:03 -07:00
committed by android-build-merger

Diff Content Not Available