Ying Wang 7d8bb82dca Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge ...

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

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1

2010-09-07 18:39:03 -07:00

..

config

…

java

Merge "Correctly set the viewport on window resize."

2010-09-07 17:17:12 -07:00

jni

am b8bcfed5: am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread

2010-09-07 14:47:51 -07:00

res

Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge

2010-09-07 18:39:03 -07:00

tests

android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff

2010-09-07 12:56:57 -07:00