tree 10fba27dc2111b4cc8e888841945727677c4a591
parent cf4682bde92b02fa99900d23382777f9ec497d0f
parent 656efe66fbabb446b8f2a285d7f21d32b7f91bcd
author Robert Ly <robertly@google.com> 1327727527 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327727527 -0800

am 656efe66: am a0def2c3: am 5d1dd1c6: Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1

* commit '656efe66fbabb446b8f2a285d7f21d32b7f91bcd':
  updating the SampleSyncAdapter sample to add stream item and photo code