tree 130a48dc5c90c2bb9c780080e763570e316be8a0
parent 039352ab5893b572b91418c1b6a50b64a48dc8f0
parent 1dc3b9abd5ab0a39bab7694669d6784b89d362ef
author Adam Cohen <adamcohen@google.com> 1345838872 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345838872 -0700

am 1dc3b9ab: Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev

* commit '1dc3b9abd5ab0a39bab7694669d6784b89d362ef':
  Adding the ability to scale the hotseat or items in the hotseat