am 17e36a2f: Fix 2157380: NPE while attaching the captured picture in MMS application on Sholes.

Merge commit '17e36a2fce4b76c0f5e282223519ce600ffc0178' into eclair-plus-aosp

* commit '17e36a2fce4b76c0f5e282223519ce600ffc0178':
  Fix 2157380: NPE while attaching the captured picture in MMS application on Sholes.
tree: 954d6a974cf54c149ec8b0c87bf0b87bdbe3e8ca
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE