Merge "Merge "CtsShimTargetPSdk should build outside APEX too." into rvc-dev am: a16b8b31f8 am: 59c837aeb2" into rvc-d1-dev-plus-aosp am: 5139392acd am: 3f750a27a3

Change-Id: I2f80ae266d0972f61152e13b1fa9d2757ccf76eb
This commit is contained in:
Automerger Merge Worker
2020-04-21 15:04:35 +00:00

Diff Content Not Available