Raphael 0aa3856227 resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp ...

Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9

2010-11-23 02:44:59 -08:00

..

res

Add positional parameters to aid in i18n

2010-06-01 11:50:47 -07:00

src/com/example/android/wiktionary

Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.

2009-12-09 11:35:26 -08:00

_index.html

Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.

2009-12-10 09:43:24 -08:00

Android.mk

Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.

2009-12-09 11:35:26 -08:00

AndroidManifest.xml

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

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