am d121059a: Merge "Make sure to not call getTelephonyManager with null context" into klp-dev

* commit 'd121059a49b2a771bb5c25f7dc8fa6ab45242a92':
  Make sure to not call getTelephonyManager with null context
tree: 734801228de06f1b5311f12f965f2ee82c066a47
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags