OSDN Git Service

am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting IMS confe...
authorTyler Gunn <tgunn@google.com>
Tue, 13 Jan 2015 21:14:23 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jan 2015 21:14:23 +0000 (21:14 +0000)
automerge: c7105c4

* commit 'c7105c46002f5e47cde61d5cc3a92e557adc2fea':
  Fix for call timer resetting when starting IMS conference call. 1/4


Trivial merge