| commit | d3152fd4527e0f98be96ae63fd32efeee68b761a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 03 17:28:10 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 03 17:28:10 2010 -0700 |
| tree | 34b6c7943b9c255bcae6e0a6353456dc792e58e2 | |
| parent | 66640a5365b4f20d96f5eda6d54fbcb2fac4e30c [diff] | |
| parent | fbbd2aced9ace1d063ad166d96a605446a9d2f7e [diff] |
am fbbd2ace: merge from open-source master