tree 0f6be2c5cbff66f580ba62881f31de07aecbdad6
parent 20976a0913783e0766b9982aaeb64ebe44f640d5
parent ca88c67135d077d3727b1017a44f271ab6ab533a
author Tao Bao <tbao@google.com> 1526070146 -0700
committer android-build-merger <android-build-merger@google.com> 1526070146 -0700

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

Change-Id: I238b8b412046c883863828d2b7578d51dadef9e0