tree 0666552ac168d6148a231582e109b27ca2954d09
parent b5af40f040f7c227604f129bcf79784c349c2ad5
parent 0e5b3d4eabfa747bab39117d512d6218b8fa7783
author Tyler Gunn <tgunn@google.com> 1421182692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421182692 +0000

am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev

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