tree 6530d6c417ec700d0ec46a3c092b42d2fbbe53a1
parent 5d5230348864049f0acc674840312ade5a690d96
parent e9390679c91a297acf06cb80e27f1840fb96e7c9
author Tianjie Xu <xunchang@google.com> 1478638992 +0000
committer android-build-merger <android-build-merger@google.com> 1478638992 +0000

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

Change-Id: Ie5be9db1d0d01f90181dba071df69e24f802c29d