| commit | c188b3d0773a00929178f124ecac93457ddd1422 | [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 | 91a7eb02fbe8d407fe757dc9d8b0c0f8206b44d7 | |
| parent | ec0efd0ceb4492814abf0592ad15efa0eae645dc [diff] | |
| parent | 7b30772ae132df02c8c4a11b5cb5f1b265a608ae [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base