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

..

android

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

com

Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen

2009-10-08 18:49:53 -07:00

jarjar-rules.txt

…

overview.html

…