Daniel Sandler 81476537fe Merge "Do not wrap action button text." into jb-dev

2012-05-16 12:22:42 -07:00

..

java

Merge "Defensively reset the default state of layout elements." into jb-dev

2012-05-16 12:01:44 -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

Do not wrap action button text.

2012-05-16 13:44:04 -04: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