Adam Cohen 662e4a456b Merge "Fix ANR which could occur for collection widgets with very large items" into jb-dev

2012-05-22 14:41:54 -07:00

..

java

Merge "Fix ANR which could occur for collection widgets with very large items" into jb-dev

2012-05-22 14:41:54 -07:00

jni

Merge "drop frame in case of error in updateTexImage" into jb-dev

2012-05-18 17:09:10 -07:00

res

Merge "Fix three-line notifications." into jb-dev

2012-05-22 08:17:29 -07:00

tests

Merge "Change NPN to forbid empty lists of protocols." into jb-dev

2012-05-17 11:18:33 -07:00