am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev

* commit '1edc4427a1c4861b030bbd0d431f3e19f2fc2450':
  Add common directory to BasicSyncAdapter sample