| commit | 736cb492aea736e9c3b33fe20285f531497462d0 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Mon Feb 02 16:00:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 02 16:00:12 2015 +0000 |
| tree | b9f53bd3ad5a7a83252982a3f9087200293e6750 | |
| parent | aea95a6a59468690102f6ffe2a5d92f99b0c91e9 [diff] | |
| parent | 235f60bc134646d1ce18ab872b982ff63b14845e [diff] |
am 235f60bc: am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev * commit '235f60bc134646d1ce18ab872b982ff63b14845e': Fixing conference merge where only one party is added to conference.