commit | 5ff25cb76cad3406e365d4cfe86b3820245e9d46 | [log] [tgz] |
---|---|---|
author | Pavel Zhamaitsiak <pavelz@google.com> | Tue Nov 11 18:11:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 18:11:45 2014 +0000 |
tree | 57b2e09e72e1dc7e05ddcc2222f5c99ebdb9b44a | |
parent | 4937d95aa4f6eecec288f1b4f2d4cfd7f4b48044 [diff] | |
parent | 7635aab10b44773d599ef8229a967fdf99d2817a [diff] |
am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev * commit '7635aab10b44773d599ef8229a967fdf99d2817a': IMS: Peer capabilities support