Eric Fischer 3a9ebe4d40 am cd64097b: Merge "Import translations. DO NOT MERGE" into jb-dev ...

* commit 'cd64097bcb5c9ed6054e5e60e0ddc78b8b1a1a0c':
  Import translations. DO NOT MERGE

2012-05-16 13:08:29 -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

Merge "Import translations. DO NOT MERGE" into jb-dev

2012-05-16 13:03:49 -07: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