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

Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9

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

..

res

Do not merge.

2010-10-21 12:46:04 -07:00

src/com/example/android/notepad

Do not merge.

2010-10-21 12:46:04 -07:00

tests

Remove use of deprecated API from test sample code.

2010-03-18 18:54:57 -07:00

_index.html

Fresh new change for:

2009-11-23 17:12:19 -05:00

Android.mk

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

AndroidManifest.xml

resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp

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