Mike LeBeau e39900ca7a Merge commit '4182e684' into manualmerge ...

Conflicts:
	core/java/android/widget/AutoCompleteTextView.java

2009-07-22 17:31:09 -07:00

..

config

Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE

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

java

Merge commit '4182e684' into manualmerge

2009-07-22 17:31:09 -07:00

jni

am 9fc20b0e: Merge change 8126 into donut

2009-07-21 19:03:53 -07:00

res

am 11b822d2: Simplify density compatibility to a boolean.

2009-07-22 12:01:19 -07:00