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

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