Romain Guy dd36336ce9 am 9e981d83: am d44a1686: Merge "Don\'t draw onto a hw surface using the software renderer Bug #6485955" into jb-dev ...

* commit '9e981d83f1b8a1f1f88b67c32b1459a23455d3fe':
  Don't draw onto a hw surface using the software renderer Bug #6485955

2012-05-15 20:35:43 -07:00

..

java

am 9e981d83: am d44a1686: Merge "Don\'t draw onto a hw surface using the software renderer Bug #6485955" into jb-dev

2012-05-15 20:35:43 -07:00

jni

Merge "Fix bug #6495019 Character gets garbled when locale is changed" into jb-dev

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

res

Merge "Import translations. DO NOT MERGE"

2012-05-15 17:28:48 -07:00

tests

am 3f68e78f: am 1d366274: Merge "Fix issue: Disable soft ap when test activity is created. Add timer for soft ap enalbing timer: 6192139" into jb-dev

2012-05-15 17:42:45 -07:00