| commit | 95bd49104f04ca9dfe5861a63c8efafad16f4c26 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Jan 13 20:58:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 20:58:14 2015 +0000 |
| tree | 60f9ee1702d8011fe20624f1a244897a92665ee7 | |
| parent | 1181c28eb79d8b0cbe84078996ad73fd187b0dd0 [diff] | |
| parent | f7b73c52c77327eeccbb2d53e88e1eacee81ce3d [diff] |
am f7b73c52: am b7806d91: Merge "Fix for call timer resetting when starting IMS conference call. 3/4" into lmp-mr1-dev * commit 'f7b73c52c77327eeccbb2d53e88e1eacee81ce3d': Fix for call timer resetting when starting IMS conference call. 3/4