[automerger skipped] Merge "Organize product vars for adding properties" am: cd0c931b89
am: 2e906be272
-s ours am: bd8b0a4b08
-s ours
am skip reason: Change-Id I98f3b5d0da661b3ad75260a23754e655103b7a44 with SHA-1 1ea01c5b24
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1320376
Change-Id: I40c7fa7383c23f419b22653e12564ff758382a89
This commit is contained in:
commit
b39da2d79c