tree 2bb350a719caf06727a410ce662c46a28c45fb72
parent 117818e4f171b1fd9daa05349c48f61388f04567
parent 789b11c715af48a0379b8b1f90d7a829ac6a8145
author Bart Sears <bsears@google.com> 1265822654 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265822654 -0800

am 789b11c7: (-s ours) am 926780b0: Merge "DO NOT MERGE" into eclair

Merge commit '789b11c715af48a0379b8b1f90d7a829ac6a8145'

* commit '789b11c715af48a0379b8b1f90d7a829ac6a8145':
  DO NOT MERGE