The Android Open Source Project 5482eca13a am 032ae72e: merge from open-source master ...

Merge commit '032ae72e19d9a12fff483664b975392ef63f2fb7' into kraken

* commit '032ae72e19d9a12fff483664b975392ef63f2fb7':
  Removed unused import

2010-06-02 07:37:37 -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

am 032ae72e: merge from open-source master

2010-06-02 07:37:37 -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 new demo of taking over a window's surface.

2010-05-18 10:46:32 -07:00