| commit | fd24e94ac2d5d765447bb0138ddea35cb55354ff | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 07:45:37 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 07:45:37 2010 -0700 |
| tree | 2d69f660cc156e76581d6ca480aaed70b82e70f6 | |
| parent | e301b7b62b8e3d5b18e0152d99bc7b7b541b6489 [diff] | |
| parent | d31ee22ff217464e74a657d129e17f5ccc1118cf [diff] |
am d31ee22f: am aebe000c: merge from open-source master