am 4f0c414c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

Merge commit '4f0c414c091daa54ac7997b7438995279506f791'

* commit '4f0c414c091daa54ac7997b7438995279506f791':
This commit is contained in:
Elliott Hughes
2009-10-12 12:32:28 -07:00
committed by Android Git Automerger

Diff Content Not Available