Romain Guy d23b2747ef Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev

2013-03-05 03:11:11 +00:00

..

java

Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev

2013-03-05 03:11:11 +00:00

jni

screenshots can now go into a Surface from java

2013-03-04 17:45:26 -08:00

res

Import translations. DO NOT MERGE

2013-03-01 08:55:13 -08:00

tests

Merge "Clean up scan handling"

2013-02-22 18:40:24 +00:00