tree 6e7744d9700aafe07993af9959e1eb98f2dacbe5
parent bde87a23f23b3904393adcaab1963ec0d4fd94f6
parent bc436ecf14a362c2b480380cb4b2edfb31cad2cd
author Treehugger Robot <treehugger-gerrit@google.com> 1607957846 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607957846 +0000

Merge "Avoid including cts-system-all.api as a test module." am: 288631d4ad am: 4ff145ff3f am: bc436ecf14

Original change: https://android-review.googlesource.com/c/platform/cts/+/1528069

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0db913e64e0ceb4f6e0fd8ddc97776953a9cf31