| commit | 82786f8aa72c968ba5ef609a3a4250d1d6f12cbd | [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 | 9fcd2af248eb737279e6bb082379c88a6ab4bc04 | |
| parent | 888e51e3bf5f589e0c163dfeb591a5dc139dada2 [diff] | |
| parent | 55d39f20660d3c619f8342bbee4bbd11a30de8ba [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base