tree d147cf902f431348850b9546061a697fe53d5df3
parent cdae591ea184ac07ea0be43d9ddf08bce2f900bc
parent 77dae001d051d0564cd718bc71ebd4dc890e4aea
author Roshan Pius <rpius@google.com> 1436892747 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436892747 +0000

am 77dae001: am 5eb7fd29: am ff5c6fde: am 2ce65bdd: am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev

* commit '77dae001d051d0564cd718bc71ebd4dc890e4aea':
  Catch & log security exception in telephonymanager