mozilla-services/android-sync — pull request #154 by rnewman (2012-04-11 05:12:10+00:00)
Title: Pre-merge commit for Bug 724739

This is develop with rnewman/deletions merged in; just stashing it here so I can test it before I merge it into develop.

The merge to develop can be a FF merge, because this is a merge commit.