Mike Lockwood b6aabcf6e3 resolved conflicts for merge of 22c140b7 to master ...

Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302

2011-05-18 09:25:49 -04:00

..

java

Merge "Improve locking granularity for PAN and Input."

2011-05-17 15:12:00 -07:00

jni

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

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

res

resolved conflicts for merge of 22c140b7 to master

2011-05-18 09:25:49 -04:00

tests

Rename ViewRoot to ViewAncestor.

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