| commit | c7105c46002f5e47cde61d5cc3a92e557adc2fea | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Jan 13 20:58:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 20:58:12 2015 +0000 |
| tree | 0666552ac168d6148a231582e109b27ca2954d09 | |
| parent | b5af40f040f7c227604f129bcf79784c349c2ad5 [diff] | |
| parent | 0e5b3d4eabfa747bab39117d512d6218b8fa7783 [diff] |
am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev * commit '0e5b3d4eabfa747bab39117d512d6218b8fa7783': Fix for call timer resetting when starting IMS conference call. 1/4