tree 12dd592174b11257d55b1580b05389605463f151
parent b69ddfd9041a8b1fd3d3053ccf54d8e34a098db8
parent f68cf7c34fe04500d5efcb5059f3333f1737a840
author Tao Bao <tbao@google.com> 1544201108 -0800
committer android-build-merger <android-build-merger@google.com> 1544201108 -0800

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

Change-Id: I1b94e616756c558bfa577fc1638a0de28cbadec7