Romain Guy d44a16864d Merge "Don't draw onto a hw surface using the software renderer Bug #6485955" into jb-dev

2012-05-15 19:19:41 -07:00

..

java

Merge "Don't draw onto a hw surface using the software renderer Bug #6485955" into jb-dev

2012-05-15 19:19:41 -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" into jb-dev

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

tests

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:34:44 -07:00