commit | 108817f3d85f80ddeb8db0ced75502520449a550 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed May 05 18:16:31 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 05 18:16:31 2010 -0700 |
tree | 52f3ebea22ec23073d0e6fa5085db12ea3330526 | |
parent | ca0e01c43998ccd3fc2971550d8326b1cdf9a795 [diff] | |
parent | 8b270a7a774ee32450dc2f442d9943a69bec84f6 [diff] |
am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master