Merge "Fix a regression in sync manager am: dfed1c73ec am: a09f3790ac" into nyc-mr1-dev-plus-aosp

am: c13ac2e388

Change-Id: I9b222d4dce6a776d026185eecbd0c6ddb2c8a09c
This commit is contained in:
Svet Ganov
2016-08-29 23:55:51 +00:00
committed by android-build-merger

Diff Content Not Available