tree 7e0d268233fc6bea07a361cf6913fc3a5e524063
parent 75dea9ca3aabe23bed2d9f15b70dbdd5efb18cd1
parent 162558382b768a4120b3e41090a4c7b53f11469a
author Tianjie Xu <xunchang@google.com> 1464026621 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464026621 +0000

Merge "Allow recovery to return error codes" into nyc-dev