Baligh Uddin 5bf93be4f4 am f0e8c78a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev ...

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

2013-04-30 16:42:36 -07:00

..

java

am 6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev

2013-04-30 16:42:33 -07:00

jni

Added flush() for bluetooth output stream

2013-04-24 00:24:34 -07:00

res

Import translations. DO NOT MERGE

2013-04-29 22:25:03 -07:00

tests

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00