tree 61f8613c90eec4ffe7fc5c1e3ed7870aeb3828f7
parent 26f86099aff8cd85290741ef4bc87c9c5d895716
parent fb3b3e4031be150aa0bcd84d3ce3cd511ba4c234
author Tao Bao <tbao@google.com> 1528997015 -0700
committer android-build-merger <android-build-merger@google.com> 1528997015 -0700

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

Change-Id: Ibb9ab1541f701f839e9511d83cc0c53ef91043b5