tree 652675b2a3d03f5a5e5e01a961731c0328520997
parent 8cb7566b1210612d92561d794d4ac4cfbcdafebf
parent 7c4d746e29ff96be6d2f021633be3eced876ce71
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