| commit | 21420d6d847e111c425233821eddb918cc50a456 | [log] [tgz] |
|---|---|---|
| author | John Wang <johnwang@google.com> | Fri Oct 15 14:26:51 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 15 14:26:51 2010 -0700 |
| tree | c13e0ce999a037ae1c3d394b1c7b22ad90233cda | |
| parent | a617fdc65be94d0ff875090d45168eec354c919e [diff] | |
| parent | b9e9f6f7e925a681fb84f21f6b2b05d338bcb747 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base