| commit | efe6039f71e9bac2138003b3287e94a7ab7e5c55 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 29 17:45:56 2010 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 29 17:45:56 2010 -0700 |
| tree | 7c7545aef44e4ee356f61b0379210f61b2a83691 | |
| parent | 3cc219dfc67b866e10828f0c17641668d47c1cd8 [diff] | |
| parent | 68335fdd6e9c1d622384612605d6952503cb7fd0 [diff] |
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD