OSDN Git Service

am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev
authorEvan Charlton <evanc@google.com>
Wed, 3 Dec 2014 18:36:10 +0000 (18:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Dec 2014 18:36:10 +0000 (18:36 +0000)
* commit '5ce118d1f4bdaaa1e85626d06d473b2dece949c3':
  Re-add Connection.getCallCapabilities


Trivial merge