tree 6530d6c417ec700d0ec46a3c092b42d2fbbe53a1
parent 5fee534a8aad8f732d85d6d5862a4b81aebf4db0
parent a1c121e03449db93b4c58a28494cd2bb12bdd7be
author Tianjie Xu <xunchang@google.com> 1478639292 +0000
committer android-build-merger <android-build-merger@google.com> 1478639292 +0000

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

Change-Id: I42cc7e9246516b7f6f9feff6f58187cee3b4b89e