[automerger skipped] Merge "Add vendor properties blacklist" into pi-dev
am: 020b22ead6
-s ours
Change-Id: Ib9ec1cb8d3df82cdbd29923b81c510d3fd2725cb
This commit is contained in:
commit
563ed34da0
am: 020b22ead6
-s ours
Change-Id: Ib9ec1cb8d3df82cdbd29923b81c510d3fd2725cb