Robert Greenwalt 86994c1fc1 resolved conflicts for merge of 40717996 to master ...

Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada

2011-06-24 16:10:06 -07:00

..

java

Merge "Don't resend WEBKIT_DRAW if paused"

2011-06-24 11:36:10 -07:00

jni

Merge "Implement APIs for Bluetooth Health profile."

2011-06-24 11:34:35 -07:00

res

resolved conflicts for merge of 40717996 to master

2011-06-24 16:10:06 -07:00

tests

Port EventRecurrence.parse() from native

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