tree 61f8613c90eec4ffe7fc5c1e3ed7870aeb3828f7
parent 888dae6c132ffef25c01e775f0a7fac906a14f9d
parent c53639d5e35d15c58602f3765f47f1a4881953f5
author Tao Bao <tbao@google.com> 1528996374 -0700
committer android-build-merger <android-build-merger@google.com> 1528996374 -0700

Merge "tests: Skip ScreenRecoveryUITest on gr_init failure."
am: c53639d5e3

Change-Id: Ia0c825cc4a74c8f6d06f09eb3ac8cdade60fc427