am bbdd505c: am f3d021bf: am 8a8f68fc: Merge "Protect against null context." into mnc-dev

* commit 'bbdd505c6bab6c5817fbd1c29dac5df90ac5732f':
  Protect against null context.
tree: 9dc3328d5b6a4c70c4691e01e9eed0142f08c63f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags