OSDN Git Service

am 258bc9cb: am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa...
authorDaisuke Miyakawa <dmiyakawa@google.com>
Tue, 13 Oct 2009 19:11:01 +0000 (12:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Oct 2009 19:11:01 +0000 (12:11 -0700)
commit7a6ba0f44213b7643685ec00c45ec4215513cf32
tree78903e24d11f626ca72883a964ab9f21d7b9ad81
parentb4b79dc0db384c591389ae8895880a53ace04eff
parent258bc9cb44f637d9ea1377d81a995bec2bd10a1d
am 258bc9cb: am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import

Merge commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d'

* commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d':
  Develop ContentResolver-based unit tests for vCard importer and fix vCard code