tree a83c5dc49636a46966a55a43ba8ec572499ac27e
parent fa1389875288be4a683b141fcbb4bae9ff39f2e2
parent f3db36e0af9205c1ea15a514225029044ce88093
author Tao Bao <tbao@google.com> 1541094063 -0700
committer android-build-merger <android-build-merger@google.com> 1541094063 -0700

Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest." am: 4ba20f1031 am: 9533329773
am: f3db36e0af

Change-Id: Id1690497e2f8422ca1f6c9a4d98ad0554aff188e