tree c4333b1d19b4dea3beb4fd5c98a3afcd88572544
parent d6ec37dcb31c1483617d3a6b124110c567b57451
parent 39cdc3ceb767f14222f7447ccb4fa1d1e201fd30
author Christopher Tate <ctate@google.com> 1271114615 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271114615 -0700

am 6a75d685: am 7e8614a5: Merge "SDK: more backup/restore documentation work" into froyo

Merge commit '6a75d6850c77fb48daba7700621856605ab60569' into kraken

* commit '6a75d6850c77fb48daba7700621856605ab60569':
  SDK: more backup/restore documentation work