tree 130a48dc5c90c2bb9c780080e763570e316be8a0
parent 05ee3cfffe4e5cf752e6072bcd2819faac121617
parent 307fe23f125cbbd5512ad8d4660025f2ab68f30b
author Adam Cohen <adamcohen@google.com> 1345838725 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1345838726 -0700

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