tree 828e6622b4bef017d4f1ed38691b214551f0a50c
parent c2d87abbe27fa64d504b15179fff33913546f95c
parent 073815431d337a76013d362eb6529e4cb48b50db
author Tao Bao <tbao@google.com> 1544201354 -0800
committer android-build-merger <android-build-merger@google.com> 1544201354 -0800

Merge "tests: Temporarily disable ScreenRecoveryUITest tests." am: ceab300864 am: f68cf7c34f
am: 073815431d

Change-Id: If6e7e107ed257f756315b0990214b4396d3cf35d