Merge commit '9150cff64abc79927ade28061ac99a1ebf812905' into gingerbread-plus-aosp * commit '9150cff64abc79927ade28061ac99a1ebf812905': Replaced /sdcard with Environment.getExternalStorageDirectory()
Merge commit '9150cff64abc79927ade28061ac99a1ebf812905' into gingerbread-plus-aosp * commit '9150cff64abc79927ade28061ac99a1ebf812905': Replaced /sdcard with Environment.getExternalStorageDirectory()