OSDN Git Service

Merge goog/eclair-dev into goog/eclair
authorJeff Hamilton <jham@android.com>
Fri, 21 Aug 2009 07:43:47 +0000 (02:43 -0500)
committerJeff Hamilton <jham@android.com>
Fri, 21 Aug 2009 08:32:50 +0000 (03:32 -0500)
commite05296673449dc6686c4fec4dd2e98ab47a78056
treedd604ede806b107e442bd7f53f4c6ec1a7d1b3ca
parentd9a3168f605f58316a803599a75d556c41169550
parentfb936a6999af73c43d5f9ce9545d26b2e4f234f4
Merge goog/eclair-dev into goog/eclair
AndroidManifest.xml
res/layout-finger/twelve_key_dialer.xml
res/layout-land-finger/twelve_key_dialer.xml
res/values/colors.xml
res/values/strings.xml
res/values/styles.xml
src/com/android/contacts/ContactsListActivity.java
src/com/android/contacts/RecentCallsListActivity.java
src/com/android/contacts/TwelveKeyDialer.java