tree 457b6a31652502c9cd6806e8774b8e937d63b35e
parent c524b3d550dc12ba6ac8b43ce46a33f9c4260dba
parent d77f34b4671c4cdd83c5878a646676abd8d224ed
author Treehugger Robot <treehugger-gerrit@google.com> 1618841053 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618841053 +0000

Merge "Don't require treble & O MR1 in AnnotationTest." am: 7e19616e1f am: 48c5ad6644 am: d77f34b467

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

Change-Id: Ic45adab8905f255b8e248e4e7684d711ba2a19d4