OSDN Git Service

resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 21:44:10 +0000 (14:44 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 21:44:10 +0000 (14:44 -0700)
commite90cc3ba6c6ccd383f31b539367c2cccea278fed
treec5e43b158779f49d8b5d108274e707ce4ca0a5c3
parent700889f504ef134ab307d95b6bfbbb426ea730e3
parent35e79e32808456a7f5f21126ed2fa7badf8dc0bc
resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp

Change-Id: I039355b9d5852436c8352efc5a85590e5f2bc080
src/com/android/launcher2/Launcher.java