am 3aff4fdf: am 56024f26: Merge change 26991 into eclair

Merge commit '3aff4fdf5c3dc1078e132bd6eda3ae980b15611e'

* commit '3aff4fdf5c3dc1078e132bd6eda3ae980b15611e':
  Add null check at isEmergencyNumber().