tree fa9dae74c8342ec5c70e5247295106a641565b7d
parent 296ddcace989a090a86385910b560c4fb05e008a
parent e04fd5375c3a26dfc92854f99889e07ff6ef1d87
author Tianjie Xu <xunchang@google.com> 1478639623 +0000
committer android-build-merger <android-build-merger@google.com> 1478639623 +0000

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

Change-Id: I0592b6ca98fd7ca598139165b198314623f69dfa