John Reck 7cbe645730 Merge "Copy over the scroll position for the scrolling layer" into jb-dev

2012-05-25 15:49:15 -07:00

..

java

Merge "Copy over the scroll position for the scrolling layer" into jb-dev

2012-05-25 15:49:15 -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 "For 720dp devices, less motion during task-to-task transition." into jb-dev

2012-05-25 14:38:47 -07:00

tests

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

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