tree a5f80299c1c4331962bff3f9c3215a09eea9a4d9
parent e03f7627874b4f8c0bfa5c302f59a6d0cd83ee40
parent 5d1dd1c68f1cefd22a67736677ab19f3fddc0033
author Robert Ly <robertly@google.com> 1327683989 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327683989 -0800

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

* commit '5d1dd1c68f1cefd22a67736677ab19f3fddc0033':
  updating the SampleSyncAdapter sample to add stream item and photo code