| commit | 76be51e50e433591e3f34dd00967b461a707adfc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 13:00:37 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 13:00:37 2010 -0700 |
| tree | e94d74e71ca2318539e76069cfc02ddc6dbeedf6 | |
| parent | b06c29505c4d56eb09ae36fa74c4199f6fe935de [diff] | |
| parent | 6cd6b7bb083bb00c04e5ec24069105c3494ab281 [diff] |
am 7c035d8a: am 2d743fe2: merge from open-source master