tree 4adca7281b6a220e1890eb02fa22d3799565bece
parent ce9882b4bcae779691de4913f4c556a5fd0650e5
parent 8c2e80c179f6f450c6eede43f08a4f7b705e2859
author Brad Ebinger <breadley@google.com> 1467999965 +0000
committer android-build-merger <android-build-merger@google.com> 1467999965 +0000

Merge \"Do not wait for EMERGENCY_CALLS_ONLY state to place Call\" into nyc-mr1-dev
am: 8c2e80c179

Change-Id: I7be705f8074a88235485b1062a7aedc2a453506e