Raph Levien e45113a156 Merge "Attempt to resolve build breakage on x86"

2013-01-15 14:58:29 -08:00

..

java

Merge "Allow supplying extras when assigning QuickContactsBadge"

2013-01-15 11:26:20 -08:00

jni

Attempt to resolve build breakage on x86

2013-01-15 14:37:27 -08:00

res

Merge "port system ui over to new ICU date formatting API."

2013-01-15 14:20:44 -08:00

tests

Merge "Fix connectivitymanagertest"

2013-01-15 10:36:40 -08:00