commit | 7b8a2361cef04d38e45a08ad3927a66b644d3c97 | [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 | bbcf68e1a77a6e8e44df6b8596d7b7e1d528373e | |
parent | 81213d6a600aa6d3c21e1467f54a20f9ca75bc06 [diff] | |
parent | d80c3e2f3c367e206cd32b97304e94fce72d70b7 [diff] |
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD