Daniel Sandler 3545bc29d8 am 81476537: Merge "Do not wrap action button text." into jb-dev ...

* commit '81476537fe9c3749616c022d26fb471f0dbd9a5c':
  Do not wrap action button text.

2012-05-16 12:26:31 -07:00

..

java

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

2012-05-16 12:04:20 -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

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:38:42 -07:00