tree 57d2f632128b2178336ddcb933c27f7f5614434b
parent bd5356468a5e6823fe4dce040ee75fbef66488dc
parent 6ce78924ebd179611c71122b864807dc4525f593
author Fred Quintana <fredq@google.com> 1272394752 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272394752 -0700

am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo

Merge commit '6ce78924ebd179611c71122b864807dc4525f593' into froyo-plus-aosp

* commit '6ce78924ebd179611c71122b864807dc4525f593':
  Add JavaDoc for SyncResult