Kenny Root a51b6fd6f8 resolved conflicts for merge of b2d0ee16 to master ...

Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4

2011-05-19 15:02:18 -07:00

..

java

resolved conflicts for merge of b2d0ee16 to master

2011-05-19 15:02:18 -07:00

jni

resolved conflicts for merge of c1730dcf to master

2011-05-19 13:34:44 -04:00

res

am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2

2011-05-18 19:16:31 -07:00

tests

Rename ViewRoot to ViewAncestor.

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