| commit | d5c19608c601738a4a9dc168ce97127f891a2645 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 04 15:39:56 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 04 15:39:56 2010 -0800 |
| tree | 7c8eba19919d586731241b5bb9c257dfe5a04c71 | |
| parent | 080404368926bbebfba6949aa30587b306cdddc8 [diff] | |
| parent | 7eca5014339c62eaefe4c78246a24887e3face0b [diff] |
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base