commit 61c48abf43082f3094f21fd4c645ad9cf4dfbd74
author Marc Blank <mblank@google.com> Wed Aug 03 12:48:49 2011 -0700
committer Marc Blank <mblank@google.com> Wed Aug 03 13:20:46 2011 -0700
tree 15825d9189c4394867e2dc8fecd47d1f74e71c41
parent 65d022dc43e4461e86fd7bc143591f542b07428b

Handle sync status 7 properly

* This indicates a failed upsync (due to a conflict with the server);
  it is rare but causes subsequent sync failure.  Very P1'ish
* Note that this is directly related to EAS 14.1 usage, and the case
  in which the server has a "replied" update to send to the client
* We now, do a subsequent sync without upsync, and THEN, when we've
  gotten the latest from the server, try to register our changes
  again.

Bug: 5111438
Change-Id: Ic1268316b3286eb92ec2f143742dd6ed1b39d153