| commit | c0362c5da3e5a855ae46210aa9b4223d70513bf2 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Wed Dec 03 20:42:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 03 20:42:39 2014 +0000 |
| tree | 8a8d84ec3ec2297b8f098b2b88824a5f591eec33 | |
| parent | 5125dc1cbc6e476903a59f84dbe0dac01c3901e0 [diff] | |
| parent | 10dff0a710b46cc1ddf554e6c83941a201aa6150 [diff] |
am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev * commit '10dff0a710b46cc1ddf554e6c83941a201aa6150': Re-add Connection.getCallCapabilities