tree 51816b3d624d2d749d7fcf0f7e3f369e27727164
parent fc7de71e2c9399b39b94c00797c294d711acdf8e
parent a2e1cebe4b42dc4b4188d0d916bfcee468a77ac5
author Sailesh Nepal <sail@google.com> 1417706787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417706787 +0000

am a2e1cebe: Merge "Fix fallback for emergency calls" into lmp-mr1-dev

* commit 'a2e1cebe4b42dc4b4188d0d916bfcee468a77ac5':
  Fix fallback for emergency calls