tree 61f8613c90eec4ffe7fc5c1e3ed7870aeb3828f7
parent b0d7bee84d6fbc528364e01c066b5077444164c3
parent c7b4418a80a342cb1b2aa4740c9c46a03a08a745
author Tao Bao <tbao@google.com> 1528996664 -0700
committer android-build-merger <android-build-merger@google.com> 1528996664 -0700

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

Change-Id: I537e815e7b3ead2f31e8031642f6e8583028b0e0