commit | d4ca6cf2c1f8b238fe413e3ba371f3369ba852f8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 25 14:22:31 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 25 14:22:31 2010 -0700 |
tree | 4b4dd18ca383531b46470f2d2be3a3de5570a285 | |
parent | 74c95d4d41dc8bf7bcee2c97bf010ed39896bb56 [diff] | |
parent | 102d0ab071af04c81ede8155205a6231b99b140c [diff] |
am 102d0ab0: merge from froyo-plus-aosp Merge commit '102d0ab071af04c81ede8155205a6231b99b140c' * commit '102d0ab071af04c81ede8155205a6231b99b140c':