| commit | f4a099573e047ebaced573e095a38e2631be7d12 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 19 11:10:11 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 19 11:10:11 2010 -0800 |
| tree | 119214c6e9d6a946df03ebfbe906651feb0f1668 | |
| parent | 4608a782049c20bafff2d7e9490f5970c288fe60 [diff] | |
| parent | 45748c30a6b0f1d3adb72fbb85c4c0db98434f4b [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base