commit | edce003d997ada8371ccf7e8e983001895bb4fd8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 16 13:50:35 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 16 13:50:35 2010 -0700 |
tree | 865001488b1da7c62d1ba9e864e0a7716d743674 | |
parent | 62968775c6f487a2de77449ad68efd2e2ddc11c9 [diff] | |
parent | 189f3d790d6cfec8d620ee8b34894541d2089923 [diff] |
am 0637db6c: merge from open-source master Merge commit '0637db6c8d91df04cf51f114774f377215718ecd' * commit '0637db6c8d91df04cf51f114774f377215718ecd':