am 7fc5e5ab: am f9f7718f: am f038004f: changes from Sync Manager API Review: bug 2164262
Merge commit '7fc5e5ab6d404d13136d30b724975798717f57f0' * commit '7fc5e5ab6d404d13136d30b724975798717f57f0': changes from Sync Manager API Review: bug 2164262
This commit is contained in:
commit
684bcfa5df