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