tree 77997dddccf574d1d2878095356208df60677707
parent dc2f9b6994cca46e6e8f91962cf5ff436cee46dd
parent 0c09e53d0f5cbaaab22628b93708911de979e8a6
author Ben Gilad <gilad@google.com> 1380741091 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380741091 -0700

am dd91d0bc: Merge "Add back the black line above the end-call button of the in-call UI." into klp-dev

* commit 'dd91d0bc7d1e3bf63631242b40561328187d3afb':
  Add back the black line above the end-call button of the in-call UI.