| commit | 6815a67c5322cbde7768330fd12882d955abdd2a | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Oct 08 20:30:41 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 20:30:41 2009 -0700 |
| tree | a2d5ed2869a23e0f5ee4e764ed693242e5e76b02 | |
| parent | a6a96cf40e6e5349715ca6d2c81602d72d37da24 [diff] | |
| parent | 0051660cea1d9d96c1e8878d90fda6f2ac7a4c6d [diff] |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp