tree 967c8b5d29522483094eb72e7219d661f9ac9e61
parent cccd16d6d5dd18e4e841d3f840caff5079e3e6a0
parent 48c5ad6644b9a3bad02d3513df4b0bdcc770e28e
author Treehugger Robot <treehugger-gerrit@google.com> 1618838984 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618838984 +0000

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

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

Change-Id: I4a050eb393c7344d93ed326f7a79ee1081e5c043