Dianne Hackborn 37cd57772b Merge "resolved conflicts for merge of 070a19e0 to master"

2011-05-23 16:59:20 -07:00

..

java

Merge "resolved conflicts for merge of 070a19e0 to master"

2011-05-23 16:59:20 -07:00

jni

resolved conflicts for merge of 070a19e0 to master

2011-05-23 14:10:26 -07:00

res

am 940138de: am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2

2011-05-21 21:35:13 -07:00

tests

Rename ViewRoot to ViewAncestor.

2011-05-04 14:08:11 -07:00