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

* commit '1edc4427a1c4861b030bbd0d431f3e19f2fc2450':
  Add common directory to BasicSyncAdapter sample
This commit is contained in:
Trevor Johns
2013-08-15 15:23:03 -07:00
committed by Android Git Automerger

View File

@@ -213,7 +213,11 @@ development/samples/samples_source.properties samples/${PLATFORM_NAME}/source.p
# #
# New sample tree # New sample tree
# Note: Some samples reference a shared "common" directory. In the future
# this will be copied in automatically via a templating system. For now,
# we need to copy it in here as needed.
developers/samples/android/connectivity samples/${PLATFORM_NAME}/connectivity developers/samples/android/connectivity samples/${PLATFORM_NAME}/connectivity
developers/samples/android/common samples/${PLATFORM_NAME}/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/common
developers/samples/android/content samples/${PLATFORM_NAME}/content developers/samples/android/content samples/${PLATFORM_NAME}/content
developers/samples/android/input samples/${PLATFORM_NAME}/input developers/samples/android/input samples/${PLATFORM_NAME}/input
developers/samples/android/media samples/${PLATFORM_NAME}/media developers/samples/android/media samples/${PLATFORM_NAME}/media