tree fcf9cdef0d82e8ae94ab384e5d6cb7ae92020f83
parent 78df66969b88b5860ba1398ccd709ea12bdf42ce
parent 687bb1872407f2480d2160aa40e044c28b0e2f41
author Tao Bao <tbao@google.com> 1568916627 -0700
committer android-build-merger <android-build-merger@google.com> 1568916627 -0700

Merge "tests: recovery_unit_test requires root." am: 15a381e52c
am: 687bb18724

Change-Id: Ibf26efe9aa858a1f6c4fce645bc67e55e7350576