| commit | b3a2e5147ea9bd2b84b648977183ddc704dbe561 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 12:46:17 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 12:46:17 2010 -0700 |
| tree | 12283462dbf86ce6f21d9a4d5e7757639be0e371 | |
| parent | fc7eccf5fd52a581b750f225d8eee5ac92490ab4 [diff] | |
| parent | 8dbc26622419821b3e56e565b22f50f2ce43a680 [diff] |
am 63ece47f: am 2a9ae01f: merge from open-source master