Merge donut into master
[android/platform/packages/apps/Sync.git] /