OSDN Git Service

Merge "Adding drag target bar."
authorWinson Chung <winsonc@google.com>
Thu, 2 Jun 2011 00:28:46 +0000 (17:28 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Jun 2011 00:28:46 +0000 (17:28 -0700)
1  2 
res/values/strings.xml
res/values/styles.xml
src/com/android/launcher2/Launcher.java
src/com/android/launcher2/Workspace.java

Simple merge
Simple merge