Nick Pelly b8a8c7a279 resolved conflicts for merge of 6ce70394 to master ...

Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf

2011-06-22 20:32:36 -07:00

..

java

resolved conflicts for merge of 6ce70394 to master

2011-06-22 20:32:36 -07:00

jni

Collapse UI events in TextureView.

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

res

Merge "Update LockScreen layouts to latest UX spec."

2011-06-22 18:10:02 -07:00

tests

Port EventRecurrence.parse() from native

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