tree b46c0d6b80fdfc84f8359eea68ae03f278f37985
parent 1dde38d2d8cbb9198d2f5c96984cf5f87a5c6fa6
parent 095a018bedbdd61985bef612e85512b8a13c7589
author Jeff Sharkey <jsharkey@android.com> 1314815542 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314815542 -0700

Merge "More robust check around TelephonyManager init."