OSDN Git Service

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...
authorDianne Hackborn <hackbod@google.com>
Thu, 8 Oct 2009 00:55:40 +0000 (17:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Oct 2009 00:55:40 +0000 (17:55 -0700)
commitfb256574b4b5b5237ddda0efcf876b8eb436c961
tree5ebc9b60f0465c1665e793da5175ae5ff4c5f9a1
parent58226c4a760fd25f6a926a6c72f3b9abd475278c
parent496b8c5d6bc656d54bc9378d00c6f9e214337bbb
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp