tree 2bb350a719caf06727a410ce662c46a28c45fb72
parent 1c00e57ca52fefd0b4ca5085a8586f53fd48277e
parent eb42a28837e19722fd8c4ba13f13068581c4bdbf
author Bart Sears <bsears@google.com> 1265823957 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265823957 -0800

am eb42a288: (-s ours) am a1ab9766: Merge "DO NOT MERGE" into eclair

Merge commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf'

* commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf':
  DO NOT MERGE