John Reck 5d5b378383 Merge "Support email and phone types"

2012-02-23 19:28:20 -08:00

..

java

Merge "Support email and phone types"

2012-02-23 19:28:20 -08:00

jni

frameworks/base refactoring

2012-02-20 22:38:43 -08:00

res

Merge "Import translations. DO NOT MERGE"

2012-02-23 13:17:10 -08:00

tests

am c16d9de7: am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1

2012-02-23 08:34:44 -08:00