tree 7fa74694a1dbd328a79fc5e0daa189b43b8c585d
parent 976fea98681dd6622685a4f7887aec3c05b5921b
parent 117f0ac39a1ad4bd849082b6e6aa5c12b1041239
author Tyler Gunn <tgunn@google.com> 1417563050 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417563050 +0000

am 117f0ac3: Merge "Fixing issue where VoLTE conference calls have incorrect call time." into lmp-mr1-dev

* commit '117f0ac39a1ad4bd849082b6e6aa5c12b1041239':
  Fixing issue where VoLTE conference calls have incorrect call time.