OSDN Git Service

Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
authorAdam Cohen <adamcohen@google.com>
Fri, 24 Aug 2012 20:05:25 +0000 (13:05 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 24 Aug 2012 20:05:26 +0000 (13:05 -0700)
commit1dc3b9abd5ab0a39bab7694669d6784b89d362ef
tree130a48dc5c90c2bb9c780080e763570e316be8a0
parent05ee3cfffe4e5cf752e6072bcd2819faac121617
parent307fe23f125cbbd5512ad8d4660025f2ab68f30b
Merge "Adding the ability to scale the hotseat or items in the hotseat" into jb-mr1-dev
res/values-sw600dp/config.xml
src/com/android/launcher2/CellLayout.java
src/com/android/launcher2/DragLayer.java