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)
commitf93a49422ba1516492a29f0563285d06d079404e
tree36b2212b819b45708aa25090a7a9e5a711dd652d
parent76275ac1c53585a374b5e5f1834631fca9392dd8
parente90cc3ba6c6ccd383f31b539367c2cccea278fed
am e90cc3ba: resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp

Merge commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed'

* commit 'e90cc3ba6c6ccd383f31b539367c2cccea278fed':
  Replaced /sdcard with Environment.getExternalStorageDirectory()
src/com/android/launcher2/Launcher.java