tree 86232fdf0854d0993b033baba91eb37939e9e228
parent 2e3754335e44ce611afea4cc9a5fd9aa0e3f5cfc
parent 97cb8040cef938d67da20519fe01deb77ecdc611
author Jason Monk <jmonk@google.com> 1434060993 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434060993 +0000

am 97cb8040: am 54380c74: Merge "Fix CarrierText airplane mode with no sims" into mnc-dev

* commit '97cb8040cef938d67da20519fe01deb77ecdc611':
  Fix CarrierText airplane mode with no sims