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