commit | b6627218a5055b2635de7878fc32fba6aed4796e | [log] [tgz] |
---|---|---|
author | Andrew Lee <anwlee@google.com> | Fri Aug 29 17:31:11 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 29 17:31:12 2014 +0000 |
tree | 3f746742d6c0e4a1b25fb560cbac51087d04562b | |
parent | 60bed394e88384a39ecae0b7c70e90d15e6f87db [diff] | |
parent | 8a76b6b8715188f00fff4c0e52d579f10cc53de3 [diff] |
Merge "Update GsmConference state to the same as its child calls." into lmp-dev