tree df84b0422b3684134bce96d5090b3df64bf87c17
parent 6c07d01ac1c0623bd11afd953971d3792f36b99d
parent eb2e05c9e8e76f46dbfba6a77dd45a786b2bd420
author Yorke Lee <yorkelee@google.com> 1410730338 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410730338 +0000

am 18331f07: am 3034f16f: Fix for quick response option not showing up for call waiting

* commit '18331f07f9abf4f6244aed2908ed45124952dcbb':
  Fix for quick response option not showing up for call waiting