tree 71915600b082d30618247ea43e5143bbff7218b4
parent d1b0af82855528c531a35d28d3c65d7a94f2228c
parent 09d8e3cf4e411b016ee65d8328dd7a443c9de0ff
author Matthew Williams <mjwilliams@google.com> 1384450046 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384450046 -0800

am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev

* commit '09d8e3cf4e411b016ee65d8328dd7a443c9de0ff':
  SyncManager now returns copy on getCurrentSyncs()