Tianjie Xu 70b5353274 resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp ...

Change-Id: I04a73db90ddb059dbb5b44fafd8e82d03ea90ca5

2016-05-02 11:17:57 -07:00

..

applypatch_test.cpp

Port applypatch.sh tests to recovery_component_tests

2016-03-11 18:37:34 -08:00

verifier_test.cpp

resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp

2016-05-02 11:17:57 -07:00