tree e9a2f5ba4db8ccb43cc2a509c3cd75cd1bcb73c3
parent a200a23af10dfcbbe46d10e868c2eae9f2c794a4
parent 5f2f41350ec127c16ea05722687201ad7a227658
author Christopher Tate <ctate@google.com> 1317082328 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317082328 -0700

Merge "Don't hang in restore if the transport reports failure" into ics-factoryrom