tree efda8819a80fa98a5166041c937b51193e35b664
parent 21c3873ba8647d0f990f27fd80ef903b443c883a
parent 32900be9d647d8083891fd42ffa247dbabdcb26d
author James Lin <jamescflin@google.com> 1616529110 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616529110 +0000

Merge "Update the CTS because of the OPTIONS API changed" am: 6d32069433 am: 32900be9d6

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

Change-Id: Icbb56dc32d0de9270b656f4976da1fdbfbbe91e6