tree 5437de90596580fd73e11bf8bd04d40d88253b7b
parent 1be5fb675ac24e493b3712be6488848d6b4fae4b
parent 9647ca3d8e9e4799d41c436db5f594ad32397290
author Santos Cordon <santoscordon@google.com> 1378330298 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378330298 -0700

am 9647ca3d: Combining InCallUI & Dialer (part 2)

* commit '9647ca3d8e9e4799d41c436db5f594ad32397290':
  Combining InCallUI & Dialer (part 2)