OSDN Git Service

am 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev
authorTyler Gunn <tgunn@google.com>
Tue, 2 Jun 2015 14:21:33 +0000 (14:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Jun 2015 14:21:33 +0000 (14:21 +0000)
commitddd1dafd26ec61613003f766d515c700d9fb11f2
tree4327509f7ef0eb04b711dd9fb2af5fd2913d588c
parent4f57deb99025c6d625ffb17eba92190670a26f67
parent2f395f3233092032be55e4148edc7b8cb3d0697b
am 2f395f32: am 0feb9c9c: Merge "IMS: Conference fixes" into mnc-dev

* commit '2f395f3233092032be55e4148edc7b8cb3d0697b':
  IMS: Conference fixes