tree e3665809e1af17187b1c9e8a59a6a6ce5d0972c0
parent 4185da518961962b7a59d744827c3f5fdd1d654c
parent dbee95cacff9d2faf30638e64abe26fbeb128787
author Android (Google) Code Review <android-gerrit@google.com> 1246930002 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1246930002 -0700

am dbee95ca: Merge change 6317 into donut

Merge commit 'dbee95cacff9d2faf30638e64abe26fbeb128787'

* commit 'dbee95cacff9d2faf30638e64abe26fbeb128787':
  Make enable/provisioning of the backup service a two-step process