tree 0b1aae0a1a0b58d7e29a7b4334e10a28ece6fbc6
parent 7d3103d005f2be452cbf7c27c7e6fb826a42d24a
author Nate Jiang <qiangjiang@google.com> 1621034358 -0700
committer Nate Jiang <qiangjiang@google.com> 1621034486 +0000

Allow shell to set merged flag on Non enterprise config

Bug: 188233722
Test: build
Change-Id: If6d440d8f88fef6d1c0f9958210fc74591de5069