Adam Powell 5d4034a37e resolved conflicts for merge of 2b6ace58 to master ...

Change-Id: Icaff26a56c3e467317ca16d71e61fe8c5e60dfda

2011-05-17 13:41:24 -07:00

..

java

resolved conflicts for merge of 2b6ace58 to master

2011-05-17 13:41:24 -07:00

jni

Merge "Updates resulting from the Skia merge (revision 1327)"

2011-05-17 04:55:56 -07:00

res

This API change is now part of MR2.

2011-05-17 10:49:53 -07:00

tests

Rename ViewRoot to ViewAncestor.

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