| commit | 38a39c339134fd80b8c8c334775145646e5c94b9 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Fri Aug 29 17:40:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 29 17:40:44 2014 +0000 |
| tree | 52e2a757728c5dfbd648c6cc0903b025171c3511 | |
| parent | d834ab6d08a2ae6188047458990ae7aeae178bfa [diff] | |
| parent | b6627218a5055b2635de7878fc32fba6aed4796e [diff] |
am b6627218: Merge "Update GsmConference state to the same as its child calls." into lmp-dev * commit 'b6627218a5055b2635de7878fc32fba6aed4796e': Update GsmConference state to the same as its child calls.