Robert Greenwalt 554475f09c Merge "resolved conflicts for merge of 40717996 to master"

2011-06-24 16:39:08 -07:00

..

java

Merge "Reduce the number of UI events required to update a SurfaceTexture."

2011-06-24 14:56:20 -07:00

jni

Merge "Fix potential advances overrun in TextLayoutCache."

2011-06-24 12:02:58 -07:00

res

resolved conflicts for merge of 40717996 to master

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

tests

Test that algorithm name is case-insensitive for digest auth.

2011-06-24 13:50:37 -07:00