tree 930f33c5f74cf0efff6feaedf41fe1f4557065d8
parent 9a73365ed7a66ffdf7507b4d040f97debde3b00e
parent d831733fabc672842e5519d724c05c8b835824b6
author PauloftheWest <paulofthewest@google.com> 1417807305 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417807305 +0000

am d831733f: am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev

* commit 'd831733fabc672842e5519d724c05c8b835824b6':
  Fixed a Settings crash when entering SIM status