tree 1528d2824cb4a6023f60f8b51a01e3984292d398
parent 9bf4d76579152fce4c045c78347a164d1b7305cd
parent 08607194cfbbb64c24900cc14afb2eeb44cacd20
author Jack Yu <jackyu@google.com> 1442438390 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442438390 +0000

am 08607194: am 717e39df: am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev

* commit '08607194cfbbb64c24900cc14afb2eeb44cacd20':
  Added a carrier config key for emergency messages on/off option always showing.