| commit | 05009e1b726658350af86247d4c40e2351e9b79d | [log] [tgz] |
|---|---|---|
| author | mike dooley <mdooley@google.com> | Fri Feb 20 02:12:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 20 02:12:23 2015 +0000 |
| tree | a3c7e9663355833a2c89c52a9352346a9bf6700b | |
| parent | dd16eefbad50828270d6470ac4feadddbf71f0e0 [diff] | |
| parent | b867a874e765f393b37f93976c3d9a723a8f9f19 [diff] |
am b867a874: Merge "Config change to not show swap button after merging calls into Cdma conference." into lmp-mr1-dev * commit 'b867a874e765f393b37f93976c3d9a723a8f9f19': Config change to not show swap button after merging calls into Cdma conference.