| commit | d2e198dc57290e694f9f74122d5389b16bbc046d | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Aug 21 15:43:07 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 21 15:43:07 2015 +0000 |
| tree | c5f595a9290a11b96b1d8221deeb112fb192d184 | |
| parent | 157e631be7904e1854678ded2e828b80febd385a [diff] | |
| parent | f789e6e1f9e67e26d13305c494f00254b92f63f3 [diff] |
Merge "Fix issue where conference timer resets to 0 when CEP enabled." into mnc-dr-dev