Merge "Make San happy: use Environment.getExternalStorage... instead of hardcoding "/sdcard""