commit | 5b069901025c58f450d6d1eb29ffdf798db1ae00 | [log] [tgz] |
---|---|---|
author | Tyler Gunn <tgunn@google.com> | Tue Jan 13 20:43:23 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 13 20:43:23 2015 +0000 |
tree | 97f0f62235f9fdb1add53e8b2079e4d18a751c0c | |
parent | cca07e2243ff650d2199e0aae81a353815e3096b [diff] | |
parent | d92e73772327537fe65edda43ca0ceb6fc781e51 [diff] |
Merge "Fix for call timer resetting when starting IMS conference call. 4/4" into lmp-mr1-dev