tree f7d0919aa6ce0c600603ee09f660c2dcd2dd6616
parent cbc7fe0df6774621206b0ccbb85294bc4d2d70ed
parent ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7
author Christopher Tate <ctate@google.com> 1270583003 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270583003 -0700

am ccb2c6cf: am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo

Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken

* commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7':
  Fix 'bmgr restore'