Romain Guy 4001b31cba am 370929f4: am d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev ...

* commit '370929f4bf6b9d7a196eae531f38cdec19140dfd':
  Finish current Canvas operations then resume previous Canvas Bug #8297260

2013-03-05 03:15:37 +00:00

..

java

am 370929f4: am d23b2747: Merge "Finish current Canvas operations then resume previous Canvas Bug #8297260" into jb-mr2-dev

2013-03-05 03:15:37 +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 09:03:55 -08:00

tests

Merge "Clean up scan handling"

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