tree 2b0f8e57f252e0c7b3d76497400b3905e0b5ebf2
parent 55883f660d116ed0a2e84869fb429d055b99bdf9
parent 8bfd96c0f8a254add3ce161ff45f4563db2c3544
author Tianjie Xu <xunchang@google.com> 1478638662 +0000
committer android-build-merger <android-build-merger@google.com> 1478638662 +0000

Merge "Move recovery_test.cpp out of unit test"
am: 8bfd96c0f8

Change-Id: I34ecca789d64dda77bec85d577ff0b7320a2b128