tree 3736d5e20f549135b99007c053a2e618b9148127
parent 09bdeeb44d3c02356b394a492f00a91057faeb9e
parent 94e6825e66d992bb1317b99038069fd08c47dd84
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583200340 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583200340 +0000

Merge "Remove `subdirs` from Android.bp files." am: b39e6bb1ad am: 94e6825e66

Change-Id: I0256ceac250499e4076acf33e166e61d1f9b179f