tree fcf9cdef0d82e8ae94ab384e5d6cb7ae92020f83
parent 04783ac8e47d53688123aa6a6188457712374749
parent 3fd5d407a4f59abd19e8bb3476d090444f77943e
author Tao Bao <tbao@google.com> 1568917005 -0700
committer android-build-merger <android-build-merger@google.com> 1568917005 -0700

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

Change-Id: I84f1b329114b423e4a308e0577d4324de1c63e76