resolve merge conflicts of ce19b57ed5 to nyc-dev
authorTyler Gunn <tgunn@google.com>
Mon, 14 Mar 2016 18:49:04 +0000 (11:49 -0700)
committerTyler Gunn <tgunn@google.com>
Mon, 14 Mar 2016 18:49:04 +0000 (11:49 -0700)
commitab48b7f15ee438d3c4bfffa799ab8f3a48158d8e
treebdea6aee093cadc0ff199b5e4a09b6a7eec92c7d
parent8e14111c716d64163a703fd8e248c6a09ad44313
parentce19b57ed5a90a099e43cca7ab7a6703ccd7173f
resolve merge conflicts of ce19b57ed5 to nyc-dev

Change-Id: Ie2312957799f5f5e35aec8767ea39ed2b7c37988
src/java/com/android/ims/ImsManager.java