OSDN Git Service

Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base...
authorJP Abgrall <jpa@google.com>
Wed, 9 Nov 2011 14:36:09 +0000 (14:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Nov 2011 14:36:09 +0000 (14:36 +0000)
commit09e1068230678fd589b98012fbd50f4da1711e36
tree003994e335f13de9e020a626dc41355b6a430256
parent616bbbd10b740ae3c82d3d3c55939cd229f5f071
parent086e2da211d7b252a7b772be0eb9911faf41c87a
Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp