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

Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9

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

..

res

…

src/com/example/android/wiktionary

…

_index.html

…

Android.mk

…

AndroidManifest.xml

…