commit | cb4ffae80d1d4e91309179aa1085ec2ce0579e46 | [log] [tgz] |
---|---|---|
author | Pavel Zhamaitsiak <pavelz@google.com> | Thu Dec 18 02:01:20 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 18 02:01:20 2014 +0000 |
tree | c31d2fc76c147a1e08764fb7fdda75564cbf86f6 | |
parent | 874d0c61e3fa8f4bb217cc388907d0e7b8342ced [diff] | |
parent | 11603bebfad30ed0cf0f4abbfd7817bc81b40c5e [diff] |
am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev automerge: a0fc9f2 automerge: 11603be * commit '11603bebfad30ed0cf0f4abbfd7817bc81b40c5e': IMS: Set phone account in IMS Conference object