| commit | 2d3010ba201a1dda5c351f8654023ddb409b3157 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Wed Nov 12 03:44:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 03:44:33 2014 +0000 |
| tree | 2342fd126c735c037d17ef45984c3c1cef27b615 | |
| parent | 8a8304d28520b0ae4c9afd24757566a953e57ae4 [diff] | |
| parent | 58944eefe3bf4295fd053bb5b74c2c7040693883 [diff] |
am 58944eef: Merge "Update CDMA conference capabilities on recalculate." into lmp-mr1-dev automerge: 6356e41 * commit '58944eefe3bf4295fd053bb5b74c2c7040693883': Update CDMA conference capabilities on recalculate.