Daisuke Miyakawa 5a016488da Merge commit 'refs/changes/08/29008/8' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import ...

Conflicts:

	core/java/android/pim/vcard/ContactStruct.java

2009-10-08 19:57:36 -07:00

..

config

…

java

Merge commit 'refs/changes/08/29008/8' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import

2009-10-08 19:57:36 -07:00

jni

Encourage developers to connect RFCOMM by UUID instead of Channel.

2009-10-07 23:25:24 +02:00

res

am 89becd79: Fix issue #2177262: Improve animations

2009-10-08 18:44:25 -07:00