OSDN Git Service

am 0125d76f: Merge "Make Conferenceable an abstract class" into mnc-dev
authorYorke Lee <yorkelee@google.com>
Thu, 14 May 2015 17:45:11 +0000 (17:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 17:45:11 +0000 (17:45 +0000)
* commit '0125d76fa37d26a29f06371ff349546e21cd3f4d':
  Make Conferenceable an abstract class


Trivial merge