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

Merge commit '696a3cab056391c45f947a6e75fc4abc2fd1351c'

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