Dianne Hackborn 4d710ad53e Merge "resolved conflicts for merge of 590ec479 to master"

2011-05-31 23:34:46 -07:00

..

java

Merge "resolved conflicts for merge of 590ec479 to master"

2011-05-31 23:34:46 -07:00

jni

Fix crash when nesting Picture recording.

2011-05-31 10:23:41 -07:00

res

resolved conflicts for merge of 590ec479 to master

2011-05-31 23:11:16 -07:00

tests

Removed unused service declaration from core tests.

2011-05-31 18:11:49 -07:00