tree 74bd300739c3c6dd236e7f12d5d28dba12690dac
parent 056d81605fde65c39a94dfbbe3c46857e5c3b70a
parent d228e6a2af05c8a327e250b1b0b848db460bbfdf
author Brad Ebinger <breadley@google.com> 1474587149 +0000
committer android-build-merger <android-build-merger@google.com> 1474587149 +0000

Merge "Adds Phone Capability check to E911 slot selection" into nyc-mr1-dev
am: d228e6a2af

Change-Id: Ifcd07433ae7d4741b2c655b9d700040a402b3fe9