Raphael ba068ce356 resolved conflicts for merge of 0aa38562 to master ...

Change-Id: I2e79f7c906477bc5d02352de6a7be17fffb4730a

2010-11-23 02:57:16 -08:00

..

res

SampleSyncAdapter sample code.

2010-02-01 15:44:47 -08:00

samplesyncadapter_server

SampleSyncAdapter sample code.

2010-02-01 15:44:47 -08:00

src/com/example/android/samplesync

fixing build

2010-08-21 18:07:01 -07:00

tests/src/com/example/android/samplesync

Clean up sample code to look better.

2010-08-20 11:47:18 -07:00

_index.html

Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.

2010-02-09 18:00:44 -08:00

Android.mk

SampleSyncAdapter sample code.

2010-02-01 15:44:47 -08:00

AndroidManifest.xml

Move <uses-sdk> before <application> in samples.

2010-11-22 12:39:47 -08:00