Jean-Baptiste Queru 0d9b02c47b Merge "resolved conflicts for merge of 1a2344b8 to master"

2010-11-17 17:35:09 -08:00

..

config

…

java

Merge "resolved conflicts for merge of 1a2344b8 to master"

2010-11-17 17:35:09 -08:00

jni

Apparently SystemProperties jni native support must now be registered before Binder's.

2010-11-16 14:48:44 -08:00

res

Adjust preference activity margins and move the widget back to the right side.

2010-11-17 15:34:45 -08:00

tests

Merge "Remove asserts in bluetooth test utils"

2010-11-16 10:41:11 -08:00