Merge "Protect against null context." into mnc-dev
tree: f1b97aa1e922ad3e4963118b3d5a18a263a85736
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags