tree 96d94bfcb23a4b6eddc6266fd25baea8ebfd14ca
parent 09f7b6873b41b0f19afc09cca74e05219c318e26
parent 87e0370bf29d8b6f1715351f43cefdf6834c7b61
author Chris Li <lihongyu@google.com> 1606864552 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606864552 +0000

Merge "Fix config loading in CTS" am: 7142e94e1b am: 58dfcc0170 am: 87e0370bf2

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

Change-Id: I2c4d647fc07a71a362c5295d3dc91080ef70e3f2