| commit | 6195432b6fde3cda4bc7e2406c8f2975795933a7 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Thu Oct 08 19:18:48 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 19:18:48 2009 -0700 |
| tree | 0fa2c9ef413db4de4d7acd9d1f83d79648aa5e83 | |
| parent | 68f857cd442c2e9b91ffb5111a5fbae7ac72edc8 [diff] | |
| parent | de6a2bc0534e6f966cb80bf8d337df8a47dd5aae [diff] |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp