[automerger skipped] Merge "DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk" into oc-mr1-dev am: 8fd807bb0d
-s ours am: b4a76d1317
-s ours am: 2ff4253b5b
am: b571c86e23
-s ours am: a2414b4459
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13326545 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I322f869ef8539a6d0e8f5797bfe8c71a8f7df087
This commit is contained in: