tree dd8559f0823ad8eb5ab23e05850d1b42f79cf742
parent 6e0ce63c4b14dfc976110ba3ed4a2cd17365544a
parent 4ba20f10315b32922d6fa40ce025435fc83e8b45
author Tao Bao <tbao@google.com> 1541093336 -0700
committer android-build-merger <android-build-merger@google.com> 1541093336 -0700

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

Change-Id: Iac05758ba00aa6fb05d18427642d198e602be7b3