| commit | 96eead6ba7c2b1cc695f19c22678d42c960d6787 | [log] [tgz] |
|---|---|---|
| author | John Wang <johnwang@google.com> | Wed Sep 22 17:06:45 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 22 17:06:45 2010 -0700 |
| tree | 653b565a6456c6bc28c77296b7401614aaf2fc2e | |
| parent | 97458e37285e7ef364985e1df1358fa9a01265b2 [diff] | |
| parent | 1eb637cc7539a61d2c8ac72195263f216571d1fc [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base