Vineeta Srivastava 14fd0ca669 Merge "wifi calling emergency address carrier config" into nyc-mr1-dev ...

am: db41be8ef4

* commit 'db41be8ef4c1c3364eaf3b552f0037f80cd0fe0f':
  wifi calling emergency address carrier config

Change-Id: I5d1ff70da4e92637e77d144eba70009a12ced185

2016-05-17 20:26:41 +00:00

..

android/telephony

Merge "wifi calling emergency address carrier config" into nyc-mr1-dev

2016-05-17 20:26:41 +00:00

com/android

Merge "OMADM intent sent by both system and apps." into nyc-dev

2016-05-17 17:48:44 +00:00