Dianne Hackborn fef966ae46 Fix another merge problem. ...

Change-Id: I3a65f3f588dd84bf163502e9c7ab99c8a22bae26

2011-05-19 22:02:22 -07:00

..

java

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

jni

Fix another merge problem.

2011-05-19 22:02:22 -07:00

res

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

tests

Rename ViewRoot to ViewAncestor.

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