OSDN Git Service

am e90cc3ba: resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 12 Oct 2010 20:57:11 +0000 (13:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Oct 2010 20:57:11 +0000 (13:57 -0700)
Merge commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed'

* commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed':
  Replaced /sdcard with Environment.getExternalStorageDirectory()

1  2 
src/com/android/launcher2/Launcher.java