tree 45955d438151b2d1519aecbcc87d3ac40d99fd1d
parent 12647d923d25f20a852b0cf7ed41f67a8b15da8f
parent 98cc133f077ba393d6c9a6e302c3e89ade64247f
author Amit Mahajan <amitmahajan@google.com> 1418671723 +0000
committer android-build-merger <android-build-merger@google.com> 1418671723 +0000

am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev
automerge: 98cc133

* commit '98cc133f077ba393d6c9a6e302c3e89ade64247f':
  Change to treat slotId 0 emergency numbers as default.