tree cfb2b2459fca772ec78ef18954d63b096cb50a14
parent 218d125d46f313a38ec02a1c7cfae25116c193d6
parent a819e505e29364ca6cbff3cf88e036e47b29ef64
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