Merge "Make sure to not call getTelephonyManager with null context" into klp-dev
tree: ea7b981ebb79c9b0b1e701ec6ac8ee5d9d91bcf0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags