Dianne Hackborn 363e035f5f Merge "Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work..."

2010-08-26 16:35:10 -07:00

..

config

…

java

Merge "Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work..."

2010-08-26 16:35:10 -07:00

jni

resolved conflicts for merge of b998f311 to gingerbread-plus-aosp

2010-08-25 17:48:47 -07:00

res

Merge "Fix 2797185: Integrate 3D RecentApps View into system."

2010-08-26 14:24:44 -07:00

tests

am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread

2010-08-24 18:31:22 -07:00