| commit | f7b73c52c77327eeccbb2d53e88e1eacee81ce3d | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Jan 13 20:51:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 20:51:44 2015 +0000 |
| tree | 9ebfd51fee343d51f1cc581dc2b2d056693d5b42 | |
| parent | 5a245bdd6651f186abd0f2dcaf430f6286328819 [diff] | |
| parent | b7806d91d7c4583449c9986932e38a9dc6821870 [diff] |
am b7806d91: Merge "Fix for call timer resetting when starting IMS conference call. 3/4" into lmp-mr1-dev * commit 'b7806d91d7c4583449c9986932e38a9dc6821870': Fix for call timer resetting when starting IMS conference call. 3/4