tree 2f8c8b0521a2a08edde150c72c9a0eca987b5602
parent ccf5b9febc9486c67ace40fbfc53b49eadf2c159
parent 3be4e7e0e371ee32d037ed2b8f7408232edb7656
author Robert Greenwalt <rgreenwalt@google.com> 1321537565 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537565 -0800

am 795fcd07: am 33fe4a36: Merge "Fix TelephonyManager to grab the best context" into ics-mr1

* commit '795fcd07943ac1aaab309a4fa0d6bad1b67671a8':
  Fix TelephonyManager to grab the best context