Merge "Wiring up Ims framework multi-endpoint APIs." into nyc-dev
authorTyler Gunn <tgunn@google.com>
Fri, 15 Apr 2016 21:07:31 +0000 (21:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Apr 2016 21:07:31 +0000 (21:07 +0000)
commit838ae541e7c8807f6895baa3b4205a5938dcbd7c
treed517f17061c0cf2e003b070d6a7ca7716a7f4854
parentd112adcd15d07aaf76de0fd647ad89bedc0474e9
parent26915f571175c8d84db6d1f2fdf54b5cb3f6926e
Merge "Wiring up Ims framework multi-endpoint APIs." into nyc-dev
am: 26915f5

* commit '26915f571175c8d84db6d1f2fdf54b5cb3f6926e':
  Wiring up Ims framework multi-endpoint APIs.

Change-Id: I11134723fab1cec76fcb87bd0d15a325b03157ec