Merge "Fix a regression in sync manager" into nyc-mr1-dev am: 6f1955bf23
am: 166d67b769
Change-Id: Ic3914dba4049b51611c69b8e016bcfe4c31a041b
This commit is contained in:
6f1955bf23
am: 166d67b769
Change-Id: Ic3914dba4049b51611c69b8e016bcfe4c31a041b