| commit | a9d364a86ef9234e436c5e0d138c11e24ef4eaeb | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Jan 13 21:15:49 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 13 21:15:49 2015 +0000 |
| tree | 511ea7cc9c36f24b5db3d11649021c8780b6ffcf | |
| parent | 69e77da22dc22ea62438b5bd529a12486d245f97 [diff] | |
| parent | 95bd49104f04ca9dfe5861a63c8efafad16f4c26 [diff] |
am f7b73c52: am b7806d91: Merge "Fix for call timer resetting when starting IMS conference call. 3/4" into lmp-mr1-dev automerge: 95bd491 * commit '95bd49104f04ca9dfe5861a63c8efafad16f4c26': Fix for call timer resetting when starting IMS conference call. 3/4