| commit | f6707f04bb81d916f3e6e07f596e050996ea3c31 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Wed Oct 01 21:38:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 21:38:54 2014 +0000 |
| tree | 484387ba31d3c7b4a21cadd7dcdc5608a276d711 | |
| parent | 51ec33bbdf6aa533ae4c1e5f0407e8a10e3d212f [diff] | |
| parent | 8f0356d8202a24af65459b1f0e9c9b60822957a3 [diff] |
am 8f0356d8: Merge "resolved conflicts for merge of ead63f02 to lmp-mr1-dev" into lmp-mr1-dev * commit '8f0356d8202a24af65459b1f0e9c9b60822957a3': Refine implementation of GSM conferences (1/3)