OSDN Git Service

am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
authorTyler Gunn <tgunn@google.com>
Mon, 1 Jun 2015 22:40:13 +0000 (22:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 22:40:13 +0000 (22:40 +0000)
* commit '0feb9c9cf947deb893f5a400489ecf7e48626281':
  IMS: Conference fixes


Trivial merge