tree 6e582db2bab7e340dae7884cf3976051520f8acb
parent 1f29a94bc40b886494fd7692f84dc13e7f709a0d
parent 8852a612266f2965d9676990d7e1d6af6d586dda
author Jason Sams <rjsams@android.com> 1254965239 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254965239 -0700

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