[automerger skipped] Merge "Temporarily whitelisting system domains writing vendor props" am: 3125af3c16

am: 11d2300472  -s ours

Change-Id: I38010e94f812f2417039fc0e70768b8c9486962b
This commit is contained in:
Jiyong Park
2018-06-06 00:50:31 -07:00
committed by android-build-merger

Diff Content Not Available