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

Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137

2010-10-01 10:42:11 -07:00

..

assets

auto import from //depot/cupcake/@135843

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

res

am ff242db8: Merge "Add samples for secure views." into gingerbread

2010-09-08 11:57:59 -07:00

src/com/example/android/apis

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

2010-10-01 10:42:11 -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

Add samples for secure views.

2010-09-07 13:04:15 -07:00