Android (Google) Code Review d880efaa3f am 3db7a730: Merge change 4880 into donut ...

Merge commit '3db7a730bce818196c216945f866939bf8a7401f'

* commit '3db7a730bce818196c216945f866939bf8a7401f':
  Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.

2009-06-23 13:08:23 -07:00

..

assets

auto import from //depot/cupcake/@135843

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

res

add sample for using colorfilters

2009-06-08 14:00:17 -04:00

src/com/example/android/apis

add sample for using colorfilters

2009-06-08 14:00:17 -04:00

tests

AI 147167: am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to

2009-04-21 11:51:42 -07:00

_index.html

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -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 sample for using colorfilters

2009-06-08 14:00:17 -04:00

default.properties

AI 145097: am: CL 144935 ApiDemos contains new API, and we must force the target to cupcake.

2009-04-08 13:34:04 -07:00