OSDN Git Service

resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284
authorEd Heyl <ed@google.com>
Wed, 25 Jul 2012 22:04:00 +0000 (15:04 -0700)
committerEd Heyl <ed@google.com>
Wed, 25 Jul 2012 22:04:00 +0000 (15:04 -0700)
commit8165f0dd202a2c0fbf0816f7613d66938955dc76
tree2c14522ad8a3a3150417c53664c0266874a76fc8
parent90abcc94258ba9d9c8b68ac9764b6ab1eba12985
parent4f174f1d27adbde6f50e11ee3a8eaf162a030284
resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284

Change-Id: I7ecce86e58af545aa18ea25e16978a1dce9dab8e
src/com/android/launcher2/AppsCustomizePagedView.java
src/com/android/launcher2/AppsCustomizeTabHost.java
src/com/android/launcher2/Launcher.java
src/com/android/launcher2/LauncherModel.java