tree 0f6be2c5cbff66f580ba62881f31de07aecbdad6
parent 3bb7332a1e29e499c611cc58beaf0ea7a58d5c0d
parent e0871294aa7996d6d53b53c044cc27fc1ff64288
author Tao Bao <tbao@google.com> 1526074482 -0700
committer android-build-merger <android-build-merger@google.com> 1526074482 -0700

Merge "tests: Add tests for ScreenRecoveryUI." am: 8c6f699b36 am: ca88c67135
am: e0871294aa

Change-Id: I20f7a642596df6112acbc208e20eac3b1b4569a7