am 80eb4fd0: (-s ours) am d1c56ea1: Ensure protocol version always set in sync services DO NOT MERGE

Merge commit '80eb4fd0fed32800cd0c78e0e26ca0b3d54c7d2b'

* commit '80eb4fd0fed32800cd0c78e0e26ca0b3d54c7d2b':
  Ensure protocol version always set in sync services DO NOT MERGE
This commit is contained in:
Marc Blank 2010-01-11 13:00:41 -08:00 committed by Android Git Automerger
commit 19423a8ec0

Diff Content Not Available