tree 5c3acf17688fdf18536efa67e833be9db3611f99
parent 91612881f298abff45b5712c86b4f645fdb8bf5f
parent 433ec6186293a78ea5e70fca1ab87e7f0b273daf
author Patrick Scott <phanna@android.com> 1270820627 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270820627 -0700

am 54c5330f: am da9a22bc: Save/restore the picture in a background thread.

Merge commit '54c5330f23adc0f9928936f44b2d20d327d900c8' into kraken

* commit '54c5330f23adc0f9928936f44b2d20d327d900c8':
  Save/restore the picture in a background thread.