OSDN Git Service

(root) / android-x86 / packages-apps-Launcher3.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: adb4229 700889f)
resolved conflicts for merge of 700889f5 to master
authorBrad Fitzpatrick <bradfitz@android.com>
Tue, 12 Oct 2010 20:52:44 +0000 (13:52 -0700)
committerBrad Fitzpatrick <bradfitz@android.com>
Tue, 12 Oct 2010 20:52:44 +0000 (13:52 -0700)
commit76275ac1c53585a374b5e5f1834631fca9392dd8
treebfaeb599f6a3664a628a4015bdaf79c3873ca34ftree | snapshot
parentadb4229c23faef81705b6b2fe1dfb8a6474c254ccommit | diff
parent700889f504ef134ab307d95b6bfbbb426ea730e3commit | diff
resolved conflicts for merge of 700889f5 to master

Change-Id: I85320de6483e6820fe27b4012bfc323ccafa0e04
src/com/android/launcher2/LauncherModel.java diff1 | diff2 | blob | history
packages/apps/Launcher3
About OSDN
Find Software
Develop Software
Help