am 936cec67: am 757ecedc: Merge "Remove use of hidden TelephonyManager methods"

* commit '936cec67ede8368f80fc2946e537fe992f5d00cf':
tree: be6c8410d182e2ccf4b355abe4995c7b65488736
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags