tree 6d03208753f4fe886880a025a63b187e203b9db7
parent 76fd9d62facb2c683b69c2e4280534abdb2281bd
parent 651474d0275f9d7cd10cdd6e0afb7dd107e66335
author PauloftheWest <paulofthewest@google.com> 1417806764 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417806764 +0000

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

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