| commit | ae5d1c39dd25ad659eeae96ab860f46c6e02ce25 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Fri Aug 24 14:19:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 24 14:19:17 2012 -0700 |
| tree | 65a080e803f57a0b1cdef60fdd6e870234afaff1 | |
| parent | edcf9b7cdcc7d663e239a24d6057c39fa5b0c119 [diff] | |
| parent | 23282720dd7972dfc528c9d55aac069acca91082 [diff] |
am 23282720: am 1dc3b9ab: Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev * commit '23282720dd7972dfc528c9d55aac069acca91082': Adding the ability to scale the hotseat or items in the hotseat