[automerger skipped] Merge "Move go default system properties into prop files"
am: 47ad7d0f60
-s ours
Change-Id: If1ce48b6d8f47baacca0db93b57fb70e04c3b978
This commit is contained in:
commit
1be0b776a2
am: 47ad7d0f60
-s ours
Change-Id: If1ce48b6d8f47baacca0db93b57fb70e04c3b978