am a04b9614: am b5723869: Merge change I85aa2b1d into eclair

Merge commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1' into eclair-mr2-plus-aosp

* commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1':
  create a test app that allows direct control of a sync adapter for testing purposes