Merge "Fix a regression in sync manager" into nyc-mr1-dev

am: 6f1955bf23

Change-Id: I34edacf49f94d6e994aaa749ee451225c28cfb54
This commit is contained in:
Svetoslav Ganov
2016-08-25 23:21:05 +00:00
committed by android-build-merger

Diff Content Not Available