[automerger skipped] Merge "Enforce specifying sdk/private for apps." into stage-aosp-master
am: 16f8f3c4a7
-s ours
Change-Id: Ibf4f59a74c96f85356891a96f7eb311bbc74a0a5
This commit is contained in:
commit
6d3b0388b3
am: 16f8f3c4a7
-s ours
Change-Id: Ibf4f59a74c96f85356891a96f7eb311bbc74a0a5