| commit | e1c22180ce2f0aad158ed4ef2ee18379c4f79802 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Aug 21 15:57:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 15:57:53 2015 +0000 |
| tree | 548b882a57d269ae35a98a7cdf19c2f5c324f2d2 | |
| parent | 8a8b9190ef0693c93ee1ea73aef398d3cc411c87 [diff] | |
| parent | 4f176b6ea2142739a965b77177cfcc5e6dd812a2 [diff] |
am 4f176b6e: am d2e198dc: Merge "Fix issue where conference timer resets to 0 when CEP enabled." into mnc-dr-dev * commit '4f176b6ea2142739a965b77177cfcc5e6dd812a2': Fix issue where conference timer resets to 0 when CEP enabled.