commit | e643daafe31a12b5a95a8fb762b3f8cc5586612e | [log] [tgz] |
---|---|---|
author | Christine Chen <christinech@google.com> | Fri Sep 13 17:33:26 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 17:33:26 2013 -0700 |
tree | 515c3d8747ffd933f9fb0164c98e28488d560e33 | |
parent | bde0b78a3b61fd57081fd6996324f02061a4435f [diff] | |
parent | 848c949a5789ae94ea266165fbd893b81ec4f7ce [diff] |
am 89aacfe1: Merge "Always checks for conference call in CallCard." into klp-dev * commit '89aacfe1e61d605bfe9aad54e9acb1c3a78024c0': Always checks for conference call in CallCard.