The Android Open Source Project bb59a9f428 Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23' ...

Conflicts:
	api/current.xml
	core/res/res/values/public.xml

2009-05-20 22:41:10 -07:00

..

config

Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE

2009-05-01 17:47:08 -07:00

java

Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base

2009-05-20 17:34:17 -07:00

jni

Remove Database.java API.

2009-05-20 15:24:14 -07:00

res

Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'

2009-05-20 22:41:10 -07:00