tree 659a0c40ed7f81fe487b1128705cf992e4b6e5d9
parent 621b48700365f5f93e5b9736b4a5508f235e7bac
parent 157ad64dbeedd43a444d3eb1cc538ee975ed2d59
author Jason Monk <jmonk@google.com> 1437691334 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437691334 +0000

am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev

* commit '157ad64dbeedd43a444d3eb1cc538ee975ed2d59':
  Fix emergency only when no sims