tree fbc4863a8e9f070be0aedcbfa974d63771437afa
parent 245eb108d5d99ad7a2485b5ce0cd7a697ac1e00d
parent 36742528f89fd13e65c8652cc684cffc9e97b567
author Android (Google) Code Review <android-gerrit@google.com> 1241122488 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241122488 -0700

am 3674252: Merge change 817 into donut

Merge commit '36742528f89fd13e65c8652cc684cffc9e97b567'

* commit '36742528f89fd13e65c8652cc684cffc9e97b567':
  Hide the backup stuff for now