The Android Open Source Project 2d75ee4ad0 merge from open-source master ...

Change-Id: I69d4b5355019fa58ef5a00e6f53e553ea71f2f90

2010-06-02 07:44:48 -07:00

..

assets

auto import from //depot/cupcake/@135843

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

res

Fix 2527411: Extend sample DPM app to test setMaximumTimeToLock()

2010-03-29 20:22:06 -07:00

src/com/example/android/apis

merge from open-source master

2010-06-02 07:44:48 -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 SMS manager demo

2010-03-01 10:57:37 -08:00