| commit | 4f176b6ea2142739a965b77177cfcc5e6dd812a2 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Aug 21 15:51:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 15:51:59 2015 +0000 |
| tree | 01fc1832384a9a9a9c0b5a35f64fa715739aa448 | |
| parent | 9a91ae80286334bc29d513f905e922461cad8733 [diff] | |
| parent | d2e198dc57290e694f9f74122d5389b16bbc046d [diff] |
am d2e198dc: Merge "Fix issue where conference timer resets to 0 when CEP enabled." into mnc-dr-dev * commit 'd2e198dc57290e694f9f74122d5389b16bbc046d': Fix issue where conference timer resets to 0 when CEP enabled.