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)
commit0d4983fc9e5993d7717d2568d0bdb75fd4e0e10c
tree009e8dc0dd17c033a4a7488705f3c2629b26a3bd
parent74ec8b754fce9ddb86c7cf4ff6636c7b318e1b24
parent0125d76fa37d26a29f06371ff349546e21cd3f4d
am 0125d76f: Merge "Make Conferenceable an abstract class" into mnc-dev

* commit '0125d76fa37d26a29f06371ff349546e21cd3f4d':
  Make Conferenceable an abstract class