Dianne Hackborn 46d6bcfb95 Merge "resolved conflicts for merge of 872a1e79 to master"

2011-06-16 16:38:07 -07:00

..

java

Merge "resolved conflicts for merge of 872a1e79 to master"

2011-06-16 16:38:07 -07:00

jni

Correctly register native methods.

2011-06-15 17:57:28 -07:00

res

Merge "Inline SeekBarPreference"

2011-06-16 13:21:52 -07:00

tests

Update getLayoutDirectionFromLocale() for using ICU

2011-06-16 14:40:31 -07:00