tree 408603d2de99059f2ffe2ffc9bbaa0327acf6f04
parent 7b5f63f8ab17c0f361d049d807bac1c4813238b5
parent c0b1c0ac80bdd080dd3b3dfe0a580eae388e27b5
author Fred Quintana <fredq@google.com> 1255372930 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255372930 -0700

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

Merge commit 'c0b1c0ac80bdd080dd3b3dfe0a580eae388e27b5'

* commit 'c0b1c0ac80bdd080dd3b3dfe0a580eae388e27b5':