tree b8910da8584244564403733bfd54ebd4d48eaa98
parent 44b1f88e3373a1e0a12f98a0763c78a53581eb9e
parent 4bad23b5e0a204830bcf6ba1ede964c51b702ceb
author Brad Ebinger <breadley@google.com> 1463516744 +0000
committer android-build-merger <android-build-merger@google.com> 1463516744 +0000

Merge "Iterate through Phones when routing Emergency Call am: 0159eeb32c am: dc5c9d8c04" into nyc-mr1-dev-plus-aosp
am: 4bad23b5e0

* commit '4bad23b5e0a204830bcf6ba1ede964c51b702ceb':

Change-Id: I31f4acf25f076db74a8dea64880b84744917c421