commit | 451eb3b9b2e81a3512d86c819fc19ade7824fa65 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 07:42:37 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 07:42:37 2010 -0700 |
tree | 176c95f6d413b5a1dc770dd411e396d029cee462 | |
parent | 99dd14ff0da23f1aa4b0d9ac449b487fcc0eee1d [diff] | |
parent | 5482eca13aa6070e098afb35c91401e3dbd7ced2 [diff] |
am 5482eca1: am 032ae72e: merge from open-source master