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