commit | d7a11c577187d47a04dc610bd54e4148ecbab1e8 | [log] [tgz] |
---|---|---|
author | Bart Sears <bsears@google.com> | Wed Feb 10 09:45:57 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 10 09:45:57 2010 -0800 |
tree | 0f069b346cb6104a760902f0b38862e3e24d293e | |
parent | 86c579d616c169d3a10e81156bd69d97c5761fd4 [diff] | |
parent | 77eb6fb19b63eb8ed9f723a5671423fff3015456 [diff] |
am eb42a288: (-s ours) am a1ab9766: Merge "DO NOT MERGE" into eclair Merge commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf' * commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf': DO NOT MERGE