tree b7bd6938b8c20f41d994ddfa4518f1c345c96472
parent abb64629e2aab05af21153a1fa07192d55160999
parent 87029dbc462479fd46ea3150567fdbdfbca94a85
author Leon Scroggins <scroggo@google.com> 1259760312 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259760312 -0800

am db08d5cd: (-s ours) DO NOT MERGE.

Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2

* commit 'db08d5cd441424e4f9621aae7c2414934f781400':
  DO NOT MERGE.