commit | 3c5600ecccd38d8fb6d39330f31fe91b5f99481b | [log] [tgz] |
---|---|---|
author | Marc Blank <mblank@google.com> | Thu Oct 08 08:32:12 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 08:32:12 2009 -0700 |
tree | 4c5c975695fef9abb86b16b76b5fbfd9a19c96f7 | |
parent | 1f00f94f880803d1b9167952fa431c8f49c2f874 [diff] | |
parent | a1b22b6ee09f238af3fe633ec3944c96a56fb5ee [diff] |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp