John Reck 628e2345cc Merge "Workaround issue of getting 0,0,0,0 inval rects"

2012-03-26 17:25:15 -07:00

..

java

Merge "Workaround issue of getting 0,0,0,0 inval rects"

2012-03-26 17:25:15 -07:00

jni

Use a status_t return type for GL functors

2012-03-26 16:45:05 -07:00

res

Import translations. DO NOT MERGE

2012-03-26 13:09:00 -07:00

tests

Merge "Add an API to expose Next Protocol Negotiation (NPN)."

2012-03-26 10:14:44 -07:00