Dirk Dougherty 2d8234b73d Merge "doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo

2010-04-01 10:35:21 -07:00

..

config

donut snapshot

2009-05-20 11:28:04 -07:00

java

Merge "doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo

2010-04-01 10:35:21 -07:00

jni

Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo

2010-03-31 18:36:35 -07:00

res

doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)

2010-04-01 09:16:08 -07:00

tests

Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo

2010-03-31 20:29:10 -07:00