| commit | c7ed01f4011e688af59f91b613e48203690c394d | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Oct 07 22:13:28 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 22:13:28 2009 -0700 |
| tree | 59bf6923a6b9f662ec9d7b0e11ff59e8d74eeb03 | |
| parent | 43fa4d920c1c43810fdc693aab1f3b7c4f41789a [diff] | |
| parent | 3f4313667e18fbf93a372a8870e88196012dce78 [diff] |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp