commit | 2eebfe4117c4c2caa338ffa2b0382783aa6eaa52 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Thu May 06 17:10:35 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 06 17:10:35 2010 -0700 |
tree | 3e3941d0d2e475e286d6260412c9090ae7632304 | |
parent | ac18a05811174685fd633918960a7fb3956bebef [diff] | |
parent | faa1461df7a7d2383e38b125e78041ebc7a54804 [diff] |
am faa1461d: am ab4f3c60: Merge "Manual integration of I32a7b5 from froyo" into kraken