tree 5d4d2532fbe00cb209108cb1f94568ebeb5111c1
parent aae5b1d11e98c705084b28da604735387ae1eb8d
parent 46c9658f4f29cf06e8d84cafdfcda3eba7f37741
author Nicolas Catania <niko@google.com> 1255128733 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255128733 -0700

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp