tree c1e6192e617086b2956a1b8c072979db64a097f3
parent c31d402569f830e7430be7453c065ea60590dad2
parent 7142e94e1ba93533d55cd937b3bf2236a8d3085d
author Chris Li <lihongyu@google.com> 1606861576 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606861576 +0000

Merge "Fix config loading in CTS" am: 7142e94e1b

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

Change-Id: Idfd3e36934ff9fd376782409288b3db463b18b2f