am ad71a8fc: Merge change 24736 into eclair
am ad71a8fc: Merge change 24736 into eclair

Merge commit 'ad71a8fc6ac5bbfa2971955a73e8345074882038'

* commit 'ad71a8fc6ac5bbfa2971955a73e8345074882038':
  Better handle filenames

bmaupin/android-sms-plus