| commit | 58944eefe3bf4295fd053bb5b74c2c7040693883 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Wed Nov 12 03:11:48 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 12 03:11:48 2014 +0000 |
| tree | 0c7307dca5b295231a05a6fa34a91b58a8a07a71 | |
| parent | 6e76da71d126b3fb32ae64e29a0b8771fe91260b [diff] | |
| parent | 6356e416d6470e8e034ab7b06f19a80039661fb9 [diff] |
Merge "Update CDMA conference capabilities on recalculate." into lmp-mr1-dev automerge: 6356e41 * commit '6356e416d6470e8e034ab7b06f19a80039661fb9': Update CDMA conference capabilities on recalculate.