tree 3d4ff2917d72dd025a12afee925e83b913fd6ebf
parent ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4
parent 3d5f648f8fe61507107b900fc3c4cf79b19572c6
author Dirk Dougherty <ddougherty@google.com> 1270143321 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1270143321 -0700

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