Jeff Brown cc633e4965 resolved conflicts for merge of 4110368b to gingerbread-plus-aosp ...

Change-Id: I23f83b1272ba6aef5a4fbadf5e450c1e0b4dd82b

2010-09-30 16:39:16 -07:00

..

assets

auto import from //depot/cupcake/@135843

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

res

Added samples for splitting touches across views.

2010-09-30 11:56:14 -07:00

src/com/example/android/apis

resolved conflicts for merge of 4110368b to gingerbread-plus-aosp

2010-09-30 16:39:16 -07:00

tests

Remove use of deprecated API from test sample code.

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

_index.html

SDK doc change: Misc fixes.

2010-01-22 15:18:15 -08:00

Android.mk

Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.

2009-06-19 18:34:39 -07:00

AndroidManifest.xml

Added samples for splitting touches across views.

2010-09-30 11:56:14 -07:00