Merge "Support VoWifi for rcs." into nyc-dev
authorGao Bing <w20090@motorola.com>
Thu, 7 Apr 2016 18:05:13 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Apr 2016 18:05:13 +0000 (18:05 +0000)
commit7b7c90b99d8ba2d0b5dcebafeab0b1b754b9b54b
treedd585aef74049502278f4db8ee6c2014d760ee0b
parent4ab4e08566cf16d163cf7cc3ff1fd19deac29f63
parent0f6e32e21862df23bb171f9e47358bcbfd9f0ae0
Merge "Support VoWifi for rcs." into nyc-dev
am: 0f6e32e

* commit '0f6e32e21862df23bb171f9e47358bcbfd9f0ae0':
  Support VoWifi for rcs.

Change-Id: If6788fca61c7fec308cf1770cad102ee66b7ab73