| commit | 94f3a36326ddecaa09787d795451b0a229fe111c | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Oct 08 17:52:53 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 17:52:53 2009 -0700 |
| tree | 30cbc1b187ac5ddde152cea16907ef198fba17cb | |
| parent | 1c83540e3829dc9664728f1f017686f16f61a4ea [diff] | |
| parent | 90d6cf74d2ca7c1638508d67ba5d253c3a1b1cbc [diff] |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp