commit | ac5aedb018c9c67e6a9d6aae302020659f8bc10b | [log] [tgz] |
---|---|---|
author | Pavel Zhamaitsiak <pavelz@google.com> | Tue Nov 11 18:55:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 18:55:30 2014 +0000 |
tree | 521e3a9213ce3b7efbba5b9fd18cbf4c05cc7b1e | |
parent | 3dc4000a82bd9ce3b7243459f5d268d79dde1525 [diff] | |
parent | aa3c3e864e58a0802fb988619816ec6a37191b71 [diff] |
am aa3c3e86: am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev automerge: 5ff25cb * commit 'aa3c3e864e58a0802fb988619816ec6a37191b71': IMS: Peer capabilities support