| commit | a80dec2d5c5a543a0629e6ca9015c51e80148606 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Tue Jan 13 21:14:23 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 13 21:14:23 2015 +0000 |
| tree | b69c1e3d57ce8bbb34d7261b778abd629f2504fe | |
| parent | fcb3be7aaa5d09f9b2bf5d00894c48a5a5362672 [diff] | |
| parent | c7105c46002f5e47cde61d5cc3a92e557adc2fea [diff] |
am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev automerge: c7105c4 * commit 'c7105c46002f5e47cde61d5cc3a92e557adc2fea': Fix for call timer resetting when starting IMS conference call. 1/4