tree 09d1891b14df72224045ee32dc1df93ed8f151df
parent e524ff534e1aabc45819e978c26bf61d9b71f444
parent 926780b023a09d37e8dcf1fabf6fa990f042f06d
author Bart Sears <bsears@google.com> 1265822317 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265822317 -0800

am 926780b0: Merge "DO NOT MERGE" into eclair

Merge commit '926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp

* commit '926780b023a09d37e8dcf1fabf6fa990f042f06d':
  DO NOT MERGE