| commit | 9b6756907b78d2aa88e5d6b5e94be2892995312f | [log] [tgz] |
|---|---|---|
| author | Patrick Scott <phanna@android.com> | Wed Apr 14 16:33:44 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 14 16:33:44 2010 -0700 |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 | |
| parent | c9d9404b5e3cd22a23b8c0fb39134a541ca60ed8 [diff] | |
| parent | 01974f88fa20b12bfa91c0455ce73278c08cea64 [diff] |
Merge branch 'kraken' of ssh://android-git:29418/platform/frameworks/base into kraken