tree d48bdb78dc97504f9a21ba22b9eaea44f0cdffd9
parent 8440ecce813112493d2af4097608735c4c7a870c
parent d1475e0375cbf1ebd5010c6ce96bbdc1de6c1b57
author Android (Google) Code Review <android-gerrit@google.com> 1247180319 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1247180319 -0700

Merge change 6689 into donut

* changes:
  Don't crash the app when restore agent bringup throws