Romain Guy 4d65fdc810 Merge "Collapse UI events in TextureView."

2011-06-22 15:01:59 -07:00

..

java

Merge "Collapse UI events in TextureView."

2011-06-22 15:01:59 -07:00

jni

Collapse UI events in TextureView.

2011-06-22 15:01:07 -07:00

res

Merge "resolved conflicts for merge of 7a652bc8 to master"

2011-06-22 14:41:09 -07:00

tests

Port EventRecurrence.parse() from native

2011-06-21 16:04:48 -07:00