tree 4acfd242fca71ecd17a8b82e49d302e2b922327d
parent ed9880f399015782c9f635db744d25281d0deeb4
parent 2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be
author Andreas Huber <andih@google.com> 1258483822 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258483822 -0800

am 2c766498: Merge change Iea6a38c6 into eclair-mr2

Merge commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be' into eclair-mr2-plus-aosp

* commit '2c7664989f7388c0c6cf0ec7d80ffa2704c8c2be':
  Squashed commit of the following: