commit | 1dd067d9defa9fb93e5b14870f230f36cb969b9b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 14:03:54 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 14:03:54 2010 -0700 |
tree | 0831981155095f5ad5f268e8d18a289d76a4a99d | |
parent | 09eae10c832101fbdaf621d0d126689ee0566aae [diff] | |
parent | 54709cb20f0664cc16556110672c8ca4a9c17d7b [diff] |
am 54709cb2: am bf11852a: merge from open-source master