| commit | 848d135ab2f8d231cec49ac932de1d70fe2c75d0 | [log] [tgz] |
|---|---|---|
| author | Christine Chen <christinech@google.com> | Fri Sep 13 17:37:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 17:37:20 2013 -0700 |
| tree | da15e12e93e26980a897a1b2a834eaaf80cb7207 | |
| parent | 23d64ad52cc27b21d206dbd44a683b505c1d9b22 [diff] | |
| parent | e643daafe31a12b5a95a8fb762b3f8cc5586612e [diff] |
am 5a2a17e8: am 89aacfe1: Merge "Always checks for conference call in CallCard." into klp-dev * commit '5a2a17e85008135cb6a11d09623de74fbfad6dd4': Always checks for conference call in CallCard.