tree 2c865b98b8cb52f3faa81f149b99f1467789d3d6
parent 2061f4e296a94093920c772cfeb12c03eac98ac6
parent 130a76c806469b5b814b1d647713dd0cdec1fe9f
author Sanket Padawe <sanketpadawe@google.com> 1424993488 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424993488 +0000

am 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

* commit '130a76c806469b5b814b1d647713dd0cdec1fe9f':
  Use TelephonyManager api to get SPN of sim to display in UI.