| commit | 615c98ae37ea702ba5ae71c619a2a74fa5c44c8b | [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 | 2bb350a719caf06727a410ce662c46a28c45fb72 | |
| parent | 1c00e57ca52fefd0b4ca5085a8586f53fd48277e [diff] | |
| parent | eb42a28837e19722fd8c4ba13f13068581c4bdbf [diff] |
am eb42a288: (-s ours) am a1ab9766: Merge "DO NOT MERGE" into eclair Merge commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf' * commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf': DO NOT MERGE