| commit | 28744b5e5efc12b765b703ba5ecfee3a3b04ec60 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Thu Oct 02 12:52:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 12:52:21 2014 +0000 |
| tree | 6e8da5dcdfdc232bf77fac5608c49cc4eaa48916 | |
| parent | 2777d4b713eadec80d720c5d7090978464b02134 [diff] | |
| parent | 8620976eb9d6830744e5e2cf6d43b445a9351611 [diff] |
am 8620976e: am f6707f04: am 8f0356d8: Merge "resolved conflicts for merge of ead63f02 to lmp-mr1-dev" into lmp-mr1-dev * commit '8620976eb9d6830744e5e2cf6d43b445a9351611': Refine implementation of GSM conferences (1/3)