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)
commit2f395f3233092032be55e4148edc7b8cb3d0697b
tree8fdd8ae9c43acef8c5be4904924d16afe155324f
parent0d69c19dcdc3df11c28d3981b086c40e94d860be
parent0feb9c9cf947deb893f5a400489ecf7e48626281
am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev

* commit '0feb9c9cf947deb893f5a400489ecf7e48626281':
  IMS: Conference fixes