| commit | cc24f76ca5e8c987920d819c399c3eca11432f17 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Fri Sep 10 15:06:38 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 10 15:06:38 2010 -0700 |
| tree | 8ed898524508a1d1bf6b4b2317a3734ff28b72ea | |
| parent | f53873d41edcbe7b2893dd0dd9f35c61850f0316 [diff] | |
| parent | 1a02fabca518806222212bdc708b36a37a7c3925 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base