tree d48a9261dcd7157a2b33f364be2e8074b45922f1
parent e8fd1952089b98e63410e85f734b2727eeee1450
parent 9d59186068891834272c2e3ee6f9c4228af24656
author Andreas Huber <andih@google.com> 1285707566 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285707566 -0700

am 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbread

Merge commit '9d59186068891834272c2e3ee6f9c4228af24656'

* commit '9d59186068891834272c2e3ee6f9c4228af24656':
  Squashed commit of the following: