tree bae5c90e525996e6bc155243b8f987848baa96fb
parent 96e1e9587798724a40f26230ae7dabaa1463d794
parent 6b9d875d275dac0d4caa19a6d6605d39407665e7
author Siarhei Vishniakou <svv@google.com> 1588611035 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588611035 +0000

Merge "Provide a timeout for SurfaceControl" into rvc-dev am: 6b9d875d27

Change-Id: Ie5df4749f68c3eeb02ef7abaad4d0b1522667dc7