OSDN Git Service

Merge "Make Conferenceable an abstract class" into mnc-dev
authorYorke Lee <yorkelee@google.com>
Thu, 14 May 2015 17:32:44 +0000 (17:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 May 2015 17:32:45 +0000 (17:32 +0000)
1  2 
api/current.txt
api/system-current.txt

diff --cc api/current.txt
Simple merge
Simple merge