| commit | efe8875f386875bae206359bafb27c950a7f1c63 | [log] [tgz] |
|---|---|---|
| author | John Wang <johnwang@google.com> | Tue Feb 15 12:43:05 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 15 12:43:05 2011 -0800 |
| tree | 42fa19b35b019b6698cac93ef94cec9f6b5133e4 | |
| parent | d946df281f694d8c3f82733e29d3cf23dc72ca2a [diff] | |
| parent | 343c52b0ed0982e64ccd16d2ea019c3132aef4b0 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base