| commit | b4ab2204460dd41409f837249b90029af19a2bd9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue May 18 11:19:29 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 18 11:19:29 2010 -0700 |
| tree | 0a5e3c2440a4e6f326486e40697a477ab3119c64 | |
| parent | 75c1b73d53a7666d29e4ac0a8d33b786ebe2b636 [diff] | |
| parent | 143c3d32f455b7ad5fc12a5415cef9336c1d377b [diff] |
am 143c3d32: am 5ccb8b8c: merge from open-source master