tree 5fb49472219e6c908684305267b5ce30157c6dfe
parent c2a1cf99e216cbc11b2e3f28b09d873ecbb2a73e
parent bfd4bdb842a174260fd39a45bc00e3b5f17ac47a
author Treehugger Robot <treehugger-gerrit@google.com> 1617747782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617747782 +0000

Merge "Add Ring test timeout." am: dbde427be6 am: bfd4bdb842

Original change: https://android-review.googlesource.com/c/platform/development/+/1664729

Change-Id: I0839c539969bc623fa69bb6b8db43122f3a66558